From a101b45916698cbc35f0bdf5ff74e634729bbd68 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Wed, 5 Mar 2014 15:26:27 +0000
Subject: [PATCH] Re arrange infolog edit popup template

---
 infolog/templates/default/app.css  |   7 +-
 infolog/templates/default/edit.xet | 254 ++++++++++++++---------------
 2 files changed, 127 insertions(+), 134 deletions(-)

diff --git a/infolog/templates/default/app.css b/infolog/templates/default/app.css
index 8744af32c8..a5602e1903 100644
--- a/infolog/templates/default/app.css
+++ b/infolog/templates/default/app.css
@@ -12,13 +12,18 @@
 .private { font-style:italic; }
 .infolog_planned { font-style:italic; }
 table.infolog_fullWidth { width: 100%; }
-td.infolog_infoId:before { content:"#" }
+.infolog_infoId:before span{ content:"#" }
 #infolog-edit_info_contact { width: 98%;}
 .infolog_fixedHeight { height: 12px; }
 .noWrap { white-space: nowrap; }
 .infolog_user_filter select { width: 100px; }
 .inputFullWidth input { width: 100%; }
 .infolog_image16 img { height: 16px; }
+td.infolog_searchParent input[type=search] { width: 90%; }
+.infolog_responsible &gt; select {width: 550px;}
+#info_contact select { width: 117px; }
+#info_contact input {width: 134px;}
+#info_subject {width: 100%;}
 tr.infolog_rowHasParent > td:first-child {
 	background-image: url(../../../phpgwapi/templates/default/images/egw_action/arrow_up.png);
 	background-repeat: no-repeat;
diff --git a/infolog/templates/default/edit.xet b/infolog/templates/default/edit.xet
index 9666678b27..d533be3f14 100644
--- a/infolog/templates/default/edit.xet
+++ b/infolog/templates/default/edit.xet
@@ -8,7 +8,7 @@
 			</columns>
 			<rows>
 				<row valign="top">
-					<textbox multiline="true" id="info_des" no_lang="1" rows="13" class="description"/>
+					<textbox multiline="true" id="info_des" no_lang="1" rows="12" cols="70" width="99%"/>
 				</row>
 			</rows>
 		</grid>
@@ -35,60 +35,6 @@
 			</rows>
 		</grid>
 	</template>
-	<template id="infolog.edit.delegation" template="" lang="" group="0" version="1.9.001">
-		<grid width="100%" height="245">
-			<columns>
-				<column width="100"/>
-				<column/>
-			</columns>
-			<rows>
-				<row class="th">
-					<description value="General" span="all"/>
-				</row>
-				<row class="row">
-					<description value="Priority" for="info_priority"/>
-					<menulist>
-						<menupopup statustext="select a priority for this task" id="info_priority"/>
-					</menulist>
-				</row>
-				<row class="row">
-					<description value="Location" for="info_location"/>
-					<textbox id="info_location" size="80" maxlength="255"/>
-				</row>
-				<row class="th">
-					<description value="Delegation" span="all"/>
-				</row>
-				<row class="nmr">
-					<description value="CC"/>
-					<grid width="100%" border="0">
-						<columns>
-							<column/>
-							<column width="16"/>
-						</columns>
-						<rows>
-							<row>
-								<textbox id="info_cc" maxlength="254" class="inputFullWidth"/>
-								<buttononly label="Add from Addressbook" onclick="return app.infolog.add_email_from_ab(form::name('ab[id]'),form::name('info_cc'));" options="users"/>
-							</row>
-							<row class="hiddenRow">
-								<link-entry blur="Search" id="ab" options="addressbook-email" span="all"/>
-							</row>
-						</rows>
-					</grid>
-				</row>
-				<row class="row" valign="top">
-					<description value="Responsible" for="info_responsible"/>
-					<listbox type="select-account" statustext="select a responsible user: a person you want to delegate this task" id="info_responsible" rows="6" account_type="both" class="responsible"/>
-				</row>
-				<row class="row" disabled="1">
-					<description value="Confirm" for="info_confirm"/>
-					<menulist>
-						<menupopup statustext="do you want a confirmation of the responsible on: accepting, finishing the task or both" id="info_confirm"/>
-					</menulist>
-				</row>
-			</rows>
-		</grid>
-	</template>
 	<template id="infolog.edit.project" template="" lang="" group="0" version="1.5.004">
 		<grid width="100%" height="245">
 			<columns>
@@ -152,73 +98,154 @@
 			</rows>
 		</grid>
 	</template>
+	<template id="infolog.edit.details" template="" lang="" group="0" version="1.9.001">
+		<grid height="245" width="100%">
+				<columns>
+					<column width="50%"/>
+					<column width="50%"/>
+				</columns>
+				<rows>
+					<row height="20" class="th">
+						<description value="Delegation" class="et2_fullWidth"/>
+						<description value="Details" class="et2_fullWidth"/> 
+					</row>
+					<row>
+						<grid>
+							<columns>
+								<column/>
+								<column/>
+							</columns>
+							<rows>
+								<row>
+									<description value="CC"/>
+									<grid width="100%" border="0">
+										<columns>
+											<column/>
+											<column width="16"/>
+										</columns>
+										<rows>
+											<row>
+												<textbox id="info_cc" maxlength="254" class="inputFullWidth"/>
+												<buttononly label="Add from Addressbook" onclick="return app.infolog.add_email_from_ab(form::name('ab[id]'),form::name('info_cc'));" options="users"/>
+											</row>
+											<row class="hiddenRow">
+												<link-entry blur="Search" id="ab" options="addressbook-email" span="all"/>
+											</row>
+										</rows>
+									</grid>
+								</row>
+								<row class="row" valign="top">
+									<description value="Responsible" for="info_responsible"/>
+									<listbox type="select-account" statustext="select a responsible user: a person you want to delegate this task" id="info_responsible" rows="6" account_type="both" class="responsible"/>
+								</row>
+								<row class="row" disabled="1">
+									<description value="Confirm" for="info_confirm"/>
+									<menulist>
+										<menupopup statustext="do you want a confirmation of the responsible on: accepting, finishing the task or both" id="info_confirm"/>
+									</menulist>
+								</row>
+							</rows>
+						</grid>
+						<grid>
+							<columns>
+								<column/>
+								<column/>
+							</columns>
+							<rows>
+								<row>
+									<description value="Category" for="info_cat"/>
+									<menulist>
+										<menupopup type="select-cat" statustext="select a category for this entry" id="info_cat" options="None"/>
+									</menulist>
+								</row>
+								<row >
+									<description value="Parent" font_style="1"/>
+									<link-entry id="info_id_parent" onchange="if(egw &amp;&amp; widget) { if(widget._oldValue) window.opener.egw.dataStoreUID(egw.appName+&quot;::&quot;+widget._oldValue,false);window.opener.egw.dataStoreUID(egw.appName+&quot;::&quot;+widget.getValue(),false);}" options="infolog" class="noWrap infolog_searchParent"/>
+								</row>
+								<row class="row">
+									<description value="Priority" for="info_priority"/>
+									<menulist>
+										<menupopup statustext="select a priority for this task" id="info_priority"/>
+									</menulist>
+								</row>
+								<row>
+									<description value="Date completed" for="info_datecompleted"/>
+									<date-time statustext="Date completed (leave it empty to have it automatic set if status is done or billed)" id="info_datecompleted" onchange="app.infolog.status_changed(this.id, form::name('info_status'), form::name('info_percent'), form::name('info_datecompleted'))"/>
+								</row>
+								<row class="row">
+									<description value="Location" for="info_location"/>
+									<textbox id="info_location" size="60" maxlength="255"/>
+								</row>
+								<row>
+									<description value="Contact" for="info_from"/>
+									<textbox blur="@blur_title" statustext="Custom contact-information, leave emtpy to use information from most recent link" id="info_from" size="60" maxlength="255"/>
+								</row>
+								<row>
+									<description value="Phone/Email" for="info_addr"/>
+									<hbox>
+										<textbox statustext="Custom contact-address, leave empty to use information from most recent link" id="info_addr" size="60" maxlength="255" class="_inputFullWidth"/>
+									</hbox>
+								</row>	
+								<row>
+									<description value="Private" for="info_access"/>
+									<checkbox statustext="should this entry only be visible to you and people you grant privat access via the ACL" id="info_access" options="private,public"/>
+								</row>
+							</rows>
+						</grid>
+					</row>
+				</rows>
+			</grid>
+	</template>
 	<template id="infolog.edit" template="" lang="" group="0" version="1.9.101">
 		<grid width="100%">
 			<columns>
 				<column width="10%"/>
-				<column width="40%"/>
+				<column width="60%"/>
 				<column width="1%"/>
-				<column width="5%"/>
-				<column width="10%"/>
-				<column width="34%"/>
+				<column width="15%"/>
+				<column width="14%"/>
 			</columns>
 			<rows>
-				<row disabled="!@msg">
-					<html align="center" id="msg" no_lang="1" span="all" class="message"/>
-					<description/>
-					<description/>
-					<description/>
-					<description/>
-					<description/>
-				</row>
 				<row height="28" class="dialog-header">
+					<description value="Title" for="info_subject"/>
+					<textbox statustext="a short subject for the entry" id="info_subject" class="et2_fullWidth et2_required" size="80" maxlength="255" span="2" tabindex="1"/>
+					<appicon src="infolog" for="info_number"/>
+					<textbox type="integer" id="info_number" readonly="true" class="infolog_infoId"/>
+				</row>
+				<row class="row dialog-header2" valign="top">
 					<description value="Type" for="info_type" vertical-align="center"/>
-					<hbox options="0,0" span="4">
+					<hbox options="0,0" span="2">
 						<menulist>
 							<menupopup statustext="Type of the log-entry: Note, Phonecall or ToDo" id="info_type" no_lang="1" onchange="1"/>
 						</menulist>
 					</hbox>
-					<textbox type="integer" id="info_number" readonly="true" span="2" class="infolog_infoId"/>
-				</row>
-				<row class="row dialog-header2" valign="top">
-					<description value="Contact" for="info_from"/>
+					<description value="Contact"/>
 					<vbox options="0,0" span="2">
 						<hbox options="0,0">
 							<link-entry id="info_contact" class="noWrap"/>
 						</hbox>
-						<textbox blur="@blur_title" statustext="Custom contact-information, leave emtpy to use information from most recent link" id="info_from" size="36" maxlength="255" class="$cont[hide_from_css]"/>
 					</vbox>
-					<checkbox statustext="Check to specify custom contact" id="info_custom_from" onchange="document.getElementById(form::name('info_from')).style.display=this.checked?'block':'none';"/>
-					<description value="Phone/Email" for="info_addr"/>
-					<textbox statustext="Custom contact-address, leave empty to use information from most recent link" id="info_addr" size="30" maxlength="255" class="_inputFullWidth"/>
 				</row>
 				<row class="row dialog-header3">
-					<description value="Category" for="info_cat"/>
-					<menulist span="2">
-						<menupopup type="select-cat" statustext="select a category for this entry" id="info_cat" options="None"/>
-					</menulist>
-					<description/>
-					<description value="Parent" font_style="1"/>
-					<link-entry id="info_id_parent" onchange="if(egw &amp;&amp; widget) { if(widget._oldValue) window.opener.egw.dataStoreUID(egw.appName+&quot;::&quot;+widget._oldValue,false);window.opener.egw.dataStoreUID(egw.appName+&quot;::&quot;+widget.getValue(),false);}" options="infolog" class="noWrap searchParent"/>
-				</row>
-				<row class="row dialog-header4">
-					<description value="Subject" for="info_subject"/>
-					<textbox statustext="a short subject for the entry" id="info_subject" class="inputFullWidth et2_required" size="80" maxlength="255" span="all" tabindex="1"/>
+					<description value="Startdate" for="info_startdate"/>
+					<date-time statustext="when should the ToDo or Phonecall be started, it shows up from that date in the filter open or own open (startpage)" id="info_startdate" span="2"/>
+					<description value="Enddate" for="info_enddate"/>
+					<date-time statustext="til when should the ToDo or Phonecall be finished" id="info_enddate"/>
 				</row>
 				<row valign="top" height="250">
 					<tabbox id="tabs" span="all">
 						<tabs>
 							<tab id="description" label="Description" statustext="longer textual description"/>
+							<tab id="details" label="Details" statustext="Location, priority , ..."/>
 							<tab id="links" label="Links" statustext="Links of this entry"/>
-							<tab id="delegation" label="Delegation" statustext="responsible user, priority"/>
 							<tab id="project" label="Projectmanager" statustext="Project settings: price, times"/>
 							<tab id="customfields" label="Customfields" statustext="Custom fields"/>
 							<tab id="history" label="History" statustext="Change history"/>
 						</tabs>
 						<tabpanels>
 							<template id="infolog.edit.description"/>
+							<template id="infolog.edit.details"/>
 							<template id="infolog.edit.links"/>
-							<template id="infolog.edit.delegation"/>
 							<template id="infolog.edit.project"/>
 							<template id="infolog.edit.customfields"/>
 							<template id="infolog.edit.history"/>
@@ -228,44 +255,24 @@
 				<row class="th" disabled="1">
 					<description value="Dates, Status, Access" span="all"/>
 				</row>
-				<row class="dialog-operators">
-					<description value="Startdate" for="info_startdate"/>
-					<date-time statustext="when should the ToDo or Phonecall be started, it shows up from that date in the filter open or own open (startpage)" id="info_startdate" options=",2"/>
-					<description/>
-					<description/>
-					<description value="Enddate" for="info_enddate"/>
-					<date-time statustext="til when should the ToDo or Phonecall be finished" id="info_enddate"/>
-				</row>
 				<row class="row dialog-operators">
 					<description value="Status" for="info_status"/>
-					<menulist>
+					<menulist span="2">
 						<menupopup statustext="@status_help" id="info_status" onchange="app.infolog.status_changed(this.id, form::name('info_status'), form::name('info_percent'), form::name('info_datecompleted'))"/>
 					</menulist>
-					<description/>
-					<description/>
 					<description value="Completed" for="info_percent"/>
 					<menulist>
 						<menupopup type="select-percent" statustext="Percent completed" id="info_percent" onchange="app.infolog.status_changed(this.id, form::name('info_status'), form::name('info_percent'), form::name('info_datecompleted'))"/>
 					</menulist>
 				</row>
-				<row class="row dialog-operators">
-					<description value="Date completed" for="info_datecompleted"/>
-					<date-time statustext="Date completed (leave it empty to have it automatic set if status is done or billed)" id="info_datecompleted" onchange="app.infolog.status_changed(this.id, form::name('info_status'), form::name('info_percent'), form::name('info_datecompleted'))"/>
-					<description/>
-					<description/>
-					<description value="Private" for="info_access"/>
-					<checkbox statustext="should this entry only be visible to you and people you grant privat access via the ACL" id="info_access" options="private,public"/>
-				</row>
 				<row class="row dialog-operators" disabled="!@info_owner">
 					<description value="Owner"/>
-					<vbox options="0,0">
+					<vbox options="0,0" span="2">
 						<menulist>
 							<menupopup type="select-account" id="info_owner" readonly="true"/>
 						</menulist>
 						<date-time id="info_created" readonly="true"/>
 					</vbox>
-					<description/>
-					<description/>
 					<description value="Last modified"/>
 					<vbox options="0">
 						<menulist>
@@ -275,7 +282,7 @@
 					</vbox>
 				</row>
 				<row class="dialog-footer-toolbar">
-					<hbox span="2">
+					<hbox span="3">
 						<button statustext="Saves this entry" label="Save" id="button[save]" image="save" background_image="1"/>
 						<button statustext="Apply the changes" label="Apply" id="button[apply]" image="apply" background_image="1"/>
 						<button statustext="leave without saveing the entry" label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel" background_image="1"/>
@@ -283,31 +290,12 @@
 							<menupopup statustext="Execute a further action for this entry" id="action" onchange="app.infolog.edit_actions()" options="Actions..."/>
 						</menulist>
 					</hbox>
-					<description/>
-
-					<hbox span="3">
-						<checkbox label="Do not notify of these changes" id="no_notifications" span="3"/>
+					<hbox span="2">
+						<checkbox label="Do not notify of these changes" id="no_notifications"/> 
 						<button align="right" statustext="delete this entry" label="Delete" id="button[delete]" onclick="if($cont[info_anz_subs]) return $cont[info_anz_subs]; et2_dialog.confirm(widget,'Delete this entry','Delete');" image="delete" background_image="1"/>
 					</hbox>
 				</row>
 			</rows>
 		</grid>
-		<styles>
-			.hideFrom input, input.hideFrom { display: none; }
-.hiddenRow {
-  display: none;
-}
-.link_select select { width: 250px; }
-.description textarea { margin: 0px; width: 99%; height: 100%;}
-td.searchParent input[type=search] { width: 90%; }
-
-/* Some nice alignment */
-select.et2_selectbox, #info_contact &gt; select { width: 117px; }
-#info_contact &gt; input {width: 134px;}
-#info_from {width: 253px;}
-#info_cat {width: 255px;}
-#info_subject {width: 100%;}
-.responsible &gt; select {width: 550px;}
-		</styles>
 	</template>
 </overlay>