[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] ged/templates/base images/work/status_icons.svg...
|
From: |
Pascal Vilarem |
|
Subject: |
[Phpgroupware-cvs] ged/templates/base images/work/status_icons.svg... |
|
Date: |
Tue, 20 Mar 2007 17:49:38 +0000 |
CVSROOT: /sources/phpgroupware
Module name: ged
Changes by: Pascal Vilarem <maat> 07/03/20 17:49:37
Modified files:
templates/base/images/work: status_icons.svg
templates/base : update_file.tpl edit_version.tpl file.tpl
Added files:
templates/base/images: remove-48.png remove-32.png add-48.png
add-32.png remove-16.png add-16.png
Log message:
modification of templates for document relations management
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ged/templates/base/images/work/status_icons.svg?cvsroot=phpgroupware&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/ged/templates/base/images/remove-48.png?cvsroot=phpgroupware&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/ged/templates/base/images/remove-32.png?cvsroot=phpgroupware&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/ged/templates/base/images/add-48.png?cvsroot=phpgroupware&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/ged/templates/base/images/add-32.png?cvsroot=phpgroupware&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/ged/templates/base/images/remove-16.png?cvsroot=phpgroupware&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/ged/templates/base/images/add-16.png?cvsroot=phpgroupware&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/ged/templates/base/update_file.tpl?cvsroot=phpgroupware&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/ged/templates/base/edit_version.tpl?cvsroot=phpgroupware&r1=1.1.1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/ged/templates/base/file.tpl?cvsroot=phpgroupware&r1=1.3&r2=1.4
Patches:
Index: images/work/status_icons.svg
===================================================================
RCS file:
/sources/phpgroupware/ged/templates/base/images/work/status_icons.svg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- images/work/status_icons.svg 9 Mar 2007 16:26:07 -0000 1.1
+++ images/work/status_icons.svg 20 Mar 2007 17:49:37 -0000 1.2
@@ -15,10 +15,10 @@
sodipodi:version="0.32"
inkscape:version="0.45"
version="1.0"
- sodipodi:docname="dessin_icones.svg"
- sodipodi:docbase="/home/pascal/Documents/Personnel/Projets/phpgroupware"
+ sodipodi:docname="status_icons.svg"
+
sodipodi:docbase="/home/pascal/public_html/phpgroupwarehead/ged/templates/base/images/work"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
-
inkscape:export-filename="/home/pascal/Documents/Personnel/Projets/phpgroupware/alert.png"
+
inkscape:export-filename="/home/pascal/public_html/phpgroupwarehead/ged/templates/base/images/remove-48.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"
sodipodi:modified="TRUE">
@@ -397,6 +397,46 @@
y1="30.118963"
x2="8.1621113"
y2="-1.1174588" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient11093"
+ id="radialGradient2260"
+ gradientUnits="userSpaceOnUse"
+
gradientTransform="matrix(0.6735047,0.5399625,-0.5610836,0.6998494,15.636283,-5.302047)"
+ cx="21.872944"
+ cy="16.022375"
+ fx="21.872944"
+ fy="16.022375"
+ r="23.485413" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3149"
+ id="linearGradient2262"
+ gradientUnits="userSpaceOnUse"
+ x1="27.017641"
+ y1="30.118963"
+ x2="8.1621113"
+ y2="-1.1174588" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient11093"
+ id="radialGradient3245"
+ gradientUnits="userSpaceOnUse"
+
gradientTransform="matrix(0.6735047,0.5399625,-0.5610836,0.6998494,15.636283,-5.302047)"
+ cx="21.872944"
+ cy="16.022375"
+ fx="21.872944"
+ fy="16.022375"
+ r="23.485413" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3149"
+ id="linearGradient3247"
+ gradientUnits="userSpaceOnUse"
+ x1="27.017641"
+ y1="30.118963"
+ x2="8.1621113"
+ y2="-1.1174588" />
</defs>
<sodipodi:namedview
id="base"
@@ -405,16 +445,16 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="1.4142136"
- inkscape:cx="184.47328"
- inkscape:cy="2.6758378"
+ inkscape:zoom="4.0000001"
+ inkscape:cx="32.928613"
+ inkscape:cy="21.494098"
inkscape:document-units="px"
- inkscape:current-layer="layer10"
+ inkscape:current-layer="layer12"
width="48px"
height="48px"
- inkscape:window-width="985"
- inkscape:window-height="737"
- inkscape:window-x="1421"
+ inkscape:window-width="1118"
+ inkscape:window-height="710"
+ inkscape:window-x="1383"
inkscape:window-y="46" />
<metadata
id="metadata7">
@@ -653,10 +693,12 @@
<g
inkscape:groupmode="layer"
id="layer10"
- inkscape:label="alerte">
+ inkscape:label="alerte"
+ sodipodi:insensitive="true"
+ style="display:none">
<path
sodipodi:type="arc"
-
style="opacity:1;fill:url(#radialGradient12138);fill-opacity:1.0;fill-rule:nonzero;stroke:url(#linearGradient12140);stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+
style="opacity:1;fill:url(#radialGradient12138);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient12140);stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
id="path12136"
sodipodi:cx="25.569487"
sodipodi:cy="25.208433"
@@ -686,6 +728,47 @@
</g>
<g
inkscape:groupmode="layer"
+ id="layer11"
+ inkscape:label="plus"
+ sodipodi:insensitive="true">
+ <path
+ sodipodi:type="arc"
+
style="opacity:1;fill:url(#radialGradient2260);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2262);stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+ id="path2258"
+ sodipodi:cx="25.569487"
+ sodipodi:cy="25.208433"
+ sodipodi:rx="23.422913"
+ sodipodi:ry="23.422913"
+ d="M 48.992399 25.208433 A 23.422913 23.422913 0 1 1
2.146574,25.208433 A 23.422913 23.422913 0 1 1 48.992399 25.208433 z"
+ transform="matrix(0.9163982,0,0,0.9163982,0.5681682,0.8990379)" />
+ <path
+
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.8435207px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 21.022856,12.14051 L 20.970136,21.814638 L 10.188887,21.761918 L
10.188887,26.506721 L 20.970136,26.559442 L 20.917416,37.077091 L
26.453021,36.971651 L 26.453021,26.559442 L 38.02507,26.612163 L
38.02507,21.867358 L 26.453021,21.814638 L 26.453021,12.14051 L
21.022856,12.14051 z "
+ id="path2264" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer12"
+ inkscape:label="moins"
+ style="opacity:1">
+ <path
+ sodipodi:type="arc"
+
style="opacity:1;fill:url(#radialGradient3245);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3247);stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+ id="path3243"
+ sodipodi:cx="25.569487"
+ sodipodi:cy="25.208433"
+ sodipodi:rx="23.422913"
+ sodipodi:ry="23.422913"
+ d="M 48.992399 25.208433 A 23.422913 23.422913 0 1 1
2.146574,25.208433 A 23.422913 23.422913 0 1 1 48.992399 25.208433 z"
+ transform="matrix(0.9163982,0,0,0.9163982,0.433022,1.034184)" />
+ <path
+
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.01758087px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 13.526761,20.601365 L 32.931907,20.748189 L 32.931907,27.518366 L
13.522888,27.371541 L 13.526761,20.601365 z "
+ id="path3249"
+ sodipodi:nodetypes="ccccc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
id="layer5"
inkscape:label="pending_for_approval"
style="opacity:1;display:none"
Index: update_file.tpl
===================================================================
RCS file: /sources/phpgroupware/ged/templates/base/update_file.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- update_file.tpl 8 Mar 2007 22:24:46 -0000 1.2
+++ update_file.tpl 20 Mar 2007 17:49:37 -0000 1.3
@@ -1,74 +1,128 @@
-<table border="0" cellpadding="5">
- <tbody>
- <tr>
- <td colspan="2">
- <h2>File info</h2>
- <form enctype="multipart/form-data"
action="{action_update}" method="post">
- <input type="hidden"
name="{element_id_field}" value="{element_id_value}">
- </td>
- </tr>
-
- <tr>
- <td style="vertical-align: top; width: 50px;">Name<br>
- </td>
- <td style="vertical-align: top;"><input type="text"
default_class="{input_default_class}" focused_class="{input_active_class}"
name="{file_name_field}" value="{file_name_value}" size="40" />
- </td>
- </tr>
- <tr>
- <td style="vertical-align: top; width:
50px;">Description<br>
- </td>
- <td style="vertical-align: top;"><textarea
name="{file_description_field}" name="description" rows="10" cols="50"
wrap="off" >{file_description_value}</textarea>
- </td>
- </tr>
- <tr>
- <td style="vertical-align: top; width:
50px;">{lang_period}<br>
- </td>
- <td style="vertical-align: top;">{select_period}
- </td>
- </tr>
- <tr>
- <td style="vertical-align: top; text-align: center;"
colspan="2"><input type="submit" name="{update_file_field}"
value="{update_file_action}">
- <input type="reset" name="{reset_file_field}"
value="{reset_file_action}">
- </form>
- </td>
- </tr>
+p<table border="0" cellpadding="5" width="100%">
+<tbody>
+<tr>
+<td colspan="2">
+<table>
+<tr>
+<td>
+<h2>File info</h2>
+<form enctype="multipart/form-data" action="{action_update}" method="post">
+<input type="hidden" name="{element_id_field}" value="{element_id_value}">
+</td>
+</tr>
+<tr>
+<td style="vertical-align: top; width: 50px;">Name<br>
+</td>
+<td style="vertical-align: top;"><input type="text"
default_class="{input_default_class}" focused_class="{input_active_class}"
name="{file_name_field}" value="{file_name_value}" size="40" />
+</td>
+</tr>
+<tr>
+<td style="vertical-align: top; width: 50px;">Description<br>
+</td>
+<td style="vertical-align: top;"><textarea name="{file_description_field}"
name="description" rows="10" cols="50" wrap="off"
>{file_description_value}</textarea>
+</td>
+</tr>
+<tr>
+<td style="vertical-align: top; width: 50px;">{lang_period}<br>
+</td>
+<td style="vertical-align: top;">{select_period}
+</td>
+</tr>
+<tr>
+<td style="vertical-align: top; text-align: center;" colspan="2"><input
type="submit" name="{update_file_field}" value="{update_file_action}">
+<input type="reset" name="{reset_file_field}" value="{reset_file_action}">
+</form>
+</td>
+</tr>
+</table>
+</td>
+</tr>
+<tr>
+<td colspan="2">
+<hr/>
+<table>
+<tr>
+<td>
+<h2 id="versions">Version</h2>
+<form enctype="multipart/form-data" action="{action_update}#versions"
method="post">
+<input type="hidden" name="{version_id_field}" value="{version_id_value}">
+<input type="hidden" name="{element_id_field}" value="{element_id_value}">
+</td>
+</tr>
+<tr>
+<td style="vertical-align: top; width: 50px;">File<br>
+</td>
+<td style="vertical-align: top;"><input name="{version_file_field}"
type="file" value="{version_file_value}""/>
+</td>
+</tr>
+<tr>
+<td style="vertical-align: top; width: 50px;">Description<br>
+</td>
+<td style="vertical-align: top;"><textarea name="{version_description_field}"
name="description" rows="10" cols="50" wrap="off"
>{version_description_value}</textarea>
+</td>
+</tr>
+<tr>
+<td style="vertical-align: top; width: 50px;">type<br>
+</td>
+<td style="vertical-align: top;">
+<!-- BEGIN version_type_block -->
+{version_type_label} <input type="radio" name="{version_type_field}"
value="{version_type_value}" {version_type_checked} />
+<!-- END version_type_block -->
+</td>
+</tr>
+</table>
+</td>
+</tr>
+<tr>
+<td>
+<table width="100%">
+ <tr>
+ <td valign="top">
+ <h3>Relations</h3>
+ <table>
+<!-- BEGIN relations_list_block -->
+<tr>
+<td>
+<input name="{relations_id_field}" type="text" value="{relations_id_value}"/>
+<input name="{relations_type_field}" type="text"
value="{relations_type_value}"/>
+</td>
+</tr>
+<!-- END relations_list_block -->
+ </table>
+ </td>
+ <td valign="top">
+ <h3>Search</h3>
+ <table>
<tr>
<td colspan="2">
- <h2>Version</h2>
- <form enctype="multipart/form-data"
action="{action_update}" method="post">
- <input type="hidden" name="{version_id_field}"
value="{version_id_value}">
- <input type="hidden" name="{element_id_field}"
value="{element_id_value}">
- </td>
- </tr>
- <tr>
- <td style="vertical-align: top; width: 50px;">File<br>
- </td>
- <td style="vertical-align: top;"><input
name="{version_file_field}" type="file" value="{version_file_value}""/>
- </td>
- </tr>
- <tr>
- <td style="vertical-align: top; width:
50px;">Description<br>
- </td>
- <td style="vertical-align: top;"><textarea
name="{version_description_field}" name="description" rows="10" cols="50"
wrap="off" >{version_description_value}</textarea>
- </td>
- </tr>
- <tr>
- <td style="vertical-align: top; width: 50px;">type<br>
- </td>
- <td style="vertical-align: top;">
-<!-- BEGIN version_type_block -->
- {version_type_label} <input type="radio"
name="{version_type_field}" value="{version_type_value}" {version_type_checked}
/>
- <!-- END version_type_block -->
+ <input type="text" name="query" value="{search_query}"> <input
type="submit" name="search"value="search" >
</td>
</tr>
- <tr>
- <td style="vertical-align: top; text-align: center;"
colspan="2">
- <input type="submit"
name="{update_version_field}" value="{update_version_action}">
- <input type="reset"
name="{reset_version_field}" value="{reset_version_action}">
- </form>
+<!-- BEGIN search_list_block -->
+<tr>
+<td width="20" valign="bottom">
+<img src="{status_image}">
+</td>
+<td valign="top"><a href="{search_link}">{name} [{reference}] {version}</a>
({element_id} {version_id})</td>
+<td width="20" valign="bottom">
+<input type="image"
src="/phpgroupwarehead/ged/templates/base/images/add-16.png"
name="do_add_relation" value="{version_id}">
+</td>
+</tr>
+<!-- END search_list_block -->
+ </table>
</td>
</tr>
- </tbody>
+</table>
+</td>
+</tr>
+<tr>
+<td style="vertical-align: top; text-align: center;" colspan="2">
+<input type="submit" name="{update_version_field}"
value="{update_version_action}">
+<input type="reset" name="{reset_version_field}"
value="{reset_version_action}">
+</form>
+</td>
+</tr>
+</tbody>
</table>
<hr/>
Index: edit_version.tpl
===================================================================
RCS file: /sources/phpgroupware/ged/templates/base/edit_version.tpl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -b -r1.1.1.1 -r1.2
--- edit_version.tpl 30 Mar 2006 12:29:23 -0000 1.1.1.1
+++ edit_version.tpl 20 Mar 2007 17:49:37 -0000 1.2
@@ -37,6 +37,12 @@
<textarea name="{description_field}" name="description" rows="10" cols="50"
wrap="off" >{description_value}</textarea>
</td>
</tr>
+<!-- BEGIN relations_list -->
+<tr>
+</tr>
+
+<!-- END relations_list -->
+</tr>
<tr>
<td colspan="2" align="center" >
<input type="submit" name="add_file" value="{lang_add_file}" />
Index: file.tpl
===================================================================
RCS file: /sources/phpgroupware/ged/templates/base/file.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- file.tpl 9 Mar 2007 16:27:10 -0000 1.3
+++ file.tpl 20 Mar 2007 17:49:37 -0000 1.4
@@ -1,32 +1,23 @@
<div id="ged_info">
-<div class="ged_file_name">{name} [{reference}] V{current_version}</div>
+<div class="ged_file_name">{name} [{reference}] v{current_version}</div>
<div class="ged_file_description">{description}<br/>
{current_version_description}</div>
<div class="ged_file_metadata">Owned by : {owner} - Creation : {creation_date}
- Version : {current_version_date} by {current_version_creator} -
{lang_current_version_expiration_date} : {current_version_expiration_date}
</div>
-Linked
-<table id="ged_file_references">
+<div class="ged_file_name">Linking to :</div>
+<table id="ged_file_relations">
+<!-- BEGIN relations_list -->
<tr>
- <td>Type</td>
- <td>Name</td>
- <td>Reference</td>
- <td>version</td>
- <td>Status</td>
+ <td>{relation_type}</td>
+ <td><a href="{relation_link}" >{relation_name} [{relation_reference}]
v{relation_version}</a></td>
+ <td><img src="{relation_status_image}"/></td>
</tr>
-<!-- BEGIN references_list -->
-<tr>
- <td>{linked_type}</td>
- <td>{linked_name}</td>
- <td>{linked_reference}</td>
- <td>{linked_current_version}</td>
- <td>Valid</td>
-</tr>
-<!-- END references_list -->
+<!-- END relations_list -->
</table>
-Versions
+<div class="ged_file_name">Versions :</div>
<table id="ged_file_versions" cellspacing="0" cellpadding"0">
<!-- BEGIN versions_list -->
<tr class="{file_version_status_oe}">
Index: images/remove-48.png
===================================================================
RCS file: images/remove-48.png
diff -N images/remove-48.png
Binary files /dev/null and /tmp/cvsNiqjOA differ
Index: images/remove-32.png
===================================================================
RCS file: images/remove-32.png
diff -N images/remove-32.png
Binary files /dev/null and /tmp/cvsZv3t8r differ
Index: images/add-48.png
===================================================================
RCS file: images/add-48.png
diff -N images/add-48.png
Binary files /dev/null and /tmp/cvsWphLRs differ
Index: images/add-32.png
===================================================================
RCS file: images/add-32.png
diff -N images/add-32.png
Binary files /dev/null and /tmp/cvsBSONhr differ
Index: images/remove-16.png
===================================================================
RCS file: images/remove-16.png
diff -N images/remove-16.png
Binary files /dev/null and /tmp/cvs4MRZhu differ
Index: images/add-16.png
===================================================================
RCS file: images/add-16.png
diff -N images/add-16.png
Binary files /dev/null and /tmp/cvsJj8Dmv differ
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] ged/templates/base images/work/status_icons.svg...,
Pascal Vilarem <=