[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] infolog/templates/default preference_colspan.tpl, 1.
|
From: |
ceb |
|
Subject: |
[Phpgroupware-cvs] infolog/templates/default preference_colspan.tpl, 1.4 preference_acl_row.tpl, 1.3 admin.tpl, 1.5 delete.xet, 1.2 index.xet, 1.4 edit.xet, 1.7 |
|
Date: |
Thu, 24 Feb 2005 13:25:43 -0000 |
Update of infolog/templates/default
Modified Files:
Branch: MAIN
preference_colspan.tpl lines: +5 -5
preference_acl_row.tpl lines: +1 -1
admin.tpl lines: +28 -18
delete.xet lines: +3 -3
index.xet lines: +6 -7
edit.xet lines: +25 -32
Log Message:
added confirmation + email notification
====================================================
Index: infolog/templates/default/preference_colspan.tpl
diff -u infolog/templates/default/preference_colspan.tpl:1.3
infolog/templates/default/preference_colspan.tpl:1.4
--- infolog/templates/default/preference_colspan.tpl:1.3 Wed Mar 12
23:39:28 2003
+++ infolog/templates/default/preference_colspan.tpl Wed Jan 5 22:12:05 2005
@@ -1,8 +1,8 @@
<tr class="th">
<td>{string}</td>
- <td align="center" width="8%">{read_lang}</td>
- <td align="center" width="8%">{add_lang}</td>
- <td align="center" width="8%">{edit_lang}</td>
- <td align="center" width="8%">{delete_lang}</td>
- <td align="center" width="8%">{private_lang}</td>
+ <td align="center" width="8%">{lang_read}</td>
+ <td align="center" width="8%">{lang_add}</td>
+ <td align="center" width="8%">{lang_edit}</td>
+ <td align="center" width="8%">{lang_delete}</td>
+ <td align="center" width="8%">{lang_private}</td>
</tr>
====================================================
====================================================
Index: infolog/templates/default/admin.tpl
diff -u infolog/templates/default/admin.tpl:1.4
infolog/templates/default/admin.tpl:1.5
--- infolog/templates/default/admin.tpl:1.4 Sun Apr 27 22:33:08 2003
+++ infolog/templates/default/admin.tpl Wed Jan 5 22:12:05 2005
@@ -1,3 +1,5 @@
+
+
<!-- BEGIN admin_line -->
<tr class="{tr_color}">
<td>{num}:</td>
@@ -8,24 +10,32 @@
<!-- END admin_line -->
<!-- BEGIN info_admin -->
-<br>
+<br />
<form action="{action_url}" method="POST">
- <table border="0">
- <tr class="th">
- <td colspan="4">{text}</td>
- </tr>
- <tr class="th">
- <td>#</td>
- <td>{lang_valid}</td>
- <td>{lang_trans}</td>
- <td>{lang_ip}</td>
- </tr>
- {admin_lines}
- <tr>
- <td colspan="4" align="left">
- {save_button} {done_button}
- </td>
- </tr>
- </table>
+ <table border="0">
+ <tr class="th">
+ <td colspan="4">{text}</td>
+ </tr>
+ <tr class="th">
+ <td>#</td>
+ <td>{lang_valid}</td>
+ <td>{lang_trans}</td>
+ <td>{lang_ip}</td>
+ </tr>
+ {admin_lines}
+ <tr height="30">
+ <td colspan="4"> </td>
+ </tr>
+ <tr class="row_on">
+ <td>{lang_enable_emailnotification}</td>
+ <td colspan="3"><input type="checkbox"
name="emailnotification" value="True" {notify_checked} /></td>
+ </tr>
+ <tr height="50" valign="bottom">
+ <td colspan="4" align="left">
+ {save_button} {done_button}
+ </td>
+ </tr>
+ </table>
</form>
+
<!-- END info_admin -->
====================================================
Index: infolog/templates/default/delete.xet
diff -u infolog/templates/default/delete.xet:1.1
infolog/templates/default/delete.xet:1.2
--- infolog/templates/default/delete.xet:1.1 Mon Oct 14 00:42:31 2002
+++ infolog/templates/default/delete.xet Wed Jan 5 22:12:05 2005
@@ -82,7 +82,7 @@
<grid content="main" align="center"
id="infolog.index.rows"/>
</row>
<row height="100">
- <description class="headertext" value="Are you
shure you want to delete this entry ?" align="center"/>
+ <description class="headertext" value="Are you
sure you want to delete this entry ?" align="center"/>
</row>
<row>
<hbox options="20" align="center">
@@ -96,4 +96,4 @@
.headertext { color: black; font-size: 120%; }
</styles>
</grid>
-</overlay>
\ No newline at end of file
+</overlay>
====================================================
Index: infolog/templates/default/index.xet
diff -u infolog/templates/default/index.xet:1.3
infolog/templates/default/index.xet:1.4
--- infolog/templates/default/index.xet:1.3 Thu Oct 17 22:19:16 2002
+++ infolog/templates/default/index.xet Wed Jan 5 22:12:05 2005
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!-- $Id$ -->
<overlay>
- <grid id="infolog.index.rows" template="" lang="" group="0"
version="0.9.15.003">
+ <grid id="infolog.index.rows" template="" lang="" group="0"
version="0.9.15.005">
<columns>
<column width="2%"/>
<column width="4%"/>
@@ -59,6 +59,8 @@
<button image="edit.gif" label="Edit"
id="edit[$row_cont[info_id]]" statustext="Edit this entry"/>
<button image="delete.gif"
label="Delete" id="delete[$row_cont[info_id]]" statustext="Delete this entry"/>
<button image="addfile.gif" label="Add
file" id="file[$row_cont[info_id]]" disabled="true" statustext="Attach a file"/>
+ <button image="confirm.gif"
label="Confirm when accepted" id="confirm[$row_cont[info_id]]"
statustext="Confirm responsibility"/>
+ <button image="finish.png"
label="Confirm when finished" id="finish[$row_cont[info_id]]"
statustext="Confirm when task is finished"/>
</hbox>
</row>
</rows>
@@ -75,15 +77,15 @@
</styles>
</grid>
- <grid id="infolog.index" template="" lang="" group=""
version="0.9.15.003" width="100%" border="0" spacing="0" padding="0">
+ <grid id="infolog.index" template="" lang="" group=""
version="0.9.15.004" width="100%" border="0" spacing="0" padding="0">
<columns>
<column width="95%"/>
<column/>
<column/>
</columns>
<rows>
- <row>
- <description class="headertext" value="InfoLog"
id="appheader"/>
+ <row disabled="1">
+ <description class="headertext" id="appheader"/>
<description class="headertext" value="Add:"
align="right"/>
<hbox>
<button image="task" label="ToDo"
align="right" id="add[task]" statustext="Add a new ToDo"/>
@@ -91,9 +93,6 @@
<button image="note" label="Note"
id="add[note]" statustext="Add a new Note"/>
</hbox>
</row>
- <row>
- <hrule span="all"/>
- </row>
<row disabled="address@hidden">
<grid content="main" span="all"
id="infolog.index.rows"/>
</row>
====================================================
Index: infolog/templates/default/edit.xet
diff -u infolog/templates/default/edit.xet:1.6
infolog/templates/default/edit.xet:1.7
--- infolog/templates/default/edit.xet:1.6 Sun Oct 20 15:06:52 2002
+++ infolog/templates/default/edit.xet Wed Jan 5 22:12:05 2005
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!-- $Id$ -->
<overlay>
- <grid id="infolog.edit.description" template="" lang="" group="0"
version="0.9.15.001" width="100%" border="0">
+ <grid id="infolog.edit.description" template="" lang="" group="0"
version="0.9.15.002" width="100%" border="0">
<columns>
<column width="100"/>
<column/>
@@ -10,36 +10,35 @@
<row class="th">
<description span="all" value="Description"/>
</row>
- <row class="row">
+ <row class="row" valign="top">
<description/>
<textbox multiline="true" rows="15" cols="80"
no_lang="1" id="info_des" statustext="enter a textual description of the
log-entry"/>
</row>
</rows>
</grid>
- <grid id="infolog.edit.links" template="" lang="" group="0"
version="0.9.15.002" width="100%">
+ <grid id="infolog.edit.links" template="" lang="" group="0"
version="0.9.15.003" width="100%">
<columns>
<column width="100"/>
- <column/>
</columns>
<rows>
<row class="th">
- <description span="all" value="Create new
links"/>
+ <description value="Create new links"/>
</row>
<row class="row">
- <link-to span="all" id="link_to"/>
+ <link-to id="link_to"/>
</row>
<row class="th">
- <description span="all" value="Existing links"/>
+ <description value="Existing links"/>
</row>
<row class="row_off" valign="top" height="164">
- <link-list span="all" id="link_to"/>
+ <link-list id="link_to"/>
</row>
</rows>
</grid>
- <grid id="infolog.edit.delegation" template="" lang="" group="0"
version="0.9.15.001" width="100%">
+ <grid id="infolog.edit.delegation" template="" lang="" group=""
version="0.9.15.001" width="100%">
<columns>
- <column width="100"/>
- <column/>
+ <column width="20%"/>
+ <column width="80%"/>
</columns>
<rows>
<row class="th">
@@ -66,12 +65,16 @@
<menupopup id="info_confirm"
statustext="do you want a confirmation of the responsible on: accepting,
finishing the task or both"/>
</menulist>
</row>
+ <row class="row">
+ <description value="Confirm status"/>
+ <description id="info_confirm_status"
readonly="true" statustext="status of confirmation"/>
+ </row>
<row class="row" height="120">
<description span="all"/>
</row>
</rows>
</grid>
- <grid id="infolog.edit" template="" lang="" group=""
version="0.9.15.003" width="100%">
+ <grid id="infolog.edit" template="" lang="" group=""
version="0.9.15.008" width="100%">
<columns>
<column width="103"/>
<column width="300"/>
@@ -79,13 +82,6 @@
<column/>
</columns>
<rows>
- <row>
- <description options="b" span="3"
class="headertext" id="appheader"/>
- <button label="Categories" align="right"
id="cats" statustext="Edit or create categories for IngoLog"/>
- </row>
- <row>
- <hrule span="all"/>
- </row>
<row class="th">
<description value="Type"/>
<menulist span="all">
@@ -104,7 +100,7 @@
</row>
<row class="row">
<description value="Contact"/>
- <textbox size="40" maxlength="64"
id="info_from" statustext="Custom contact-information, leave emtpy to use
information from most recent link"/>
+ <textbox size="40" maxlength="64"
id="info_from" statustext="Custom contact-information, leave emtpy to use
information from most recent link" blur="@blur_title"/>
<description value="Phone/Email"/>
<textbox size="40" maxlength="64"
id="info_addr" statustext="Custom contact-address, leave empty to use
information from most recent link"/>
</row>
@@ -112,7 +108,7 @@
<description value="Subject"/>
<textbox size="64" maxlength="64" span="all"
id="info_subject" needed="1" statustext="a short subject for the entry"/>
</row>
- <row>
+ <row height="250">
<tabbox>
<tabs span="all">
<tab label="Description"
statustext="longer textual description"/>
@@ -131,32 +127,29 @@
</row>
<row class="row">
<description value="Startdate"/>
- <hbox options="0,0">
- <date id="info_startdate"
statustext="when should the ToDo or Phonecall be started, it shows up from that
date in the filter open or own open (startpage)"/>
- <checkbox label="%s Today"
id="set_today" statustext="check to set startday"/>
- </hbox>
+ <date-time options=",2" id="info_startdate"
statustext="when should the ToDo or Phonecall be started, it shows up from that
date in the filter open or own open (startpage)"/>
<description value="Enddate"/>
<date id="info_enddate" statustext="til when
should the ToDo or Phonecall be finished"/>
</row>
<row class="row">
<description value="Status"/>
<menulist>
- <menupopup id="info_status"
statustext="@status_help"/>
+ <menupopup id="info_status"
statustext="allows to set the status of an entry, eg. set a ToDo to done if
it's finished (values depend on entry-typ)"/>
</menulist>
<description value="Private"/>
<checkbox options="private,public"
id="info_access" statustext="should this entry only be visible to you and
people you grant privat access via the ACL"/>
</row>
- <row class="th">
+ <row class="row">
<description value="Owner"/>
<menulist>
- <menupopup type="select-account"
options=",,2" id="info_owner" readonly="true"/>
+ <menupopup type="select-account"
id="info_owner" readonly="true"/>
</menulist>
<description value="Last modified"/>
<hbox options="0,0">
<menulist>
- <menupopup
type="select-account" options=",,2" id="info_modifier" readonly="true"/>
+ <menupopup
type="select-account" id="info_modifier" readonly="true"/>
</menulist>
- <date class="lpadding5"
id="info_datemodified" readonly="true"/>
+ <date-time class="lpadding5"
id="info_datemodified" readonly="true"/>
</hbox>
</row>
<row>
@@ -171,4 +164,4 @@
.lpadding5 { padding-left: 5px; };
</styles>
</grid>
-</overlay>
\ No newline at end of file
+</overlay>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] infolog/templates/default preference_colspan.tpl, 1.4 preference_acl_row.tpl, 1.3 admin.tpl, 1.5 delete.xet, 1.2 index.xet, 1.4 edit.xet, 1.7,
ceb <=
- Prev by Date:
[Phpgroupware-cvs] old/addbook/doc copyright.gpl, 1.1 README.phpgwapi, 1.1 README, 1.1
- Next by Date:
[Phpgroupware-cvs] infolog/templates/default edit.xet, 1.8 index.xet, 1.5
- Previous by thread:
[Phpgroupware-cvs] old/addbook/doc copyright.gpl, 1.1 README.phpgwapi, 1.1 README, 1.1
- Next by thread:
[Phpgroupware-cvs] infolog/templates/default edit.xet, 1.8 index.xet, 1.5
- Index(es):