From 356c2b0cee1c20cf5ac9900fe41666cb0c555100 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Wed, 6 Jul 2016 12:19:20 +0200
Subject: [PATCH] Infolog mobile template: - Fix view mode styling - Get
 info_number shown in view mode, similar to other apps - Some code cleanup

---
 infolog/templates/mobile/app.css  |  6 +++++
 infolog/templates/mobile/app.less |  4 ++++
 infolog/templates/mobile/edit.xet |  3 +--
 infolog/templates/mobile/view.xet | 39 +++++++++++--------------------
 4 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/infolog/templates/mobile/app.css b/infolog/templates/mobile/app.css
index 33af44f4fb..facdb66a47 100644
--- a/infolog/templates/mobile/app.css
+++ b/infolog/templates/mobile/app.css
@@ -92,6 +92,12 @@
   #infolog-view tr.dialogHeadbar div.et2_hbox {
     display: none;
   }
+  #infolog-view .et2_label.et2_label_empty {
+    padding-left: 0px;
+  }
+  #infolog-view .et2_label.et2_label_empty * {
+    padding-left: 0px;
+  }
   .infolog_CompletedClmn .infoPercent {
     height: 23px;
     float: right;
diff --git a/infolog/templates/mobile/app.less b/infolog/templates/mobile/app.less
index c97f6a09c2..2c658d94e4 100644
--- a/infolog/templates/mobile/app.less
+++ b/infolog/templates/mobile/app.less
@@ -104,6 +104,10 @@
 				display:none;
 			}
 		}
+		.et2_label.et2_label_empty {
+			padding-left:0px;
+			* {padding-left:0px;}
+		}
 	}
 	.infolog_CompletedClmn {
 		.infoPercent{
diff --git a/infolog/templates/mobile/edit.xet b/infolog/templates/mobile/edit.xet
index 332bf4b529..7806157143 100644
--- a/infolog/templates/mobile/edit.xet
+++ b/infolog/templates/mobile/edit.xet
@@ -172,7 +172,7 @@
 						<button statustext="Apply the changes" id="button[apply]" image="apply" background_image="1"/>
 						<button statustext="delete this entry" 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" span="all"/>
 						<buttononly statustext="Insert timestamp into description field" id="timestamp" class="infologExtraButton infologTimestamp" background_image="1" image="timestamp" onclick="app.infolog.insert_text('info_des');"/>
-						<checkbox label="notification" id="no_notifications"/>
+						<checkbox label="do not notify" id="no_notifications"/>
 						<textbox type="integer" id="info_number" readonly="true" class="entry_id"/>
 					</hbox>
 				</row>
@@ -192,7 +192,6 @@
 						<menulist class="et2_fullWidth">
 							<menupopup statustext="Type of the log-entry: Note, Phonecall or ToDo" id="info_type" no_lang="1" onchange="widget.getInstanceManager().submit(null,false,true); return false;" />
 						</menulist>
-						<textbox align="right" type="integer" id="info_number" readonly="true"/>
 					</hbox>
 				</row>
 				<row>
diff --git a/infolog/templates/mobile/view.xet b/infolog/templates/mobile/view.xet
index 00d184267e..37a5ac8033 100644
--- a/infolog/templates/mobile/view.xet
+++ b/infolog/templates/mobile/view.xet
@@ -29,13 +29,13 @@
 			<rows>
 				<row>
 					<description value="Project"/>
-					<link-entry id="pm_id" only_app='projectmanager' onchange="app.infolog.submit_if_not_empty" blur="None" class="infolog_projectName"/>
+					<link-entry id="pm_id" only_app='projectmanager' blur="None" class="infolog_projectName"/>
 				</row>
 				<row>
 					<description value="Price"/>
 					<hbox>
 						<textbox type="float" id="info_price" size="10"/>
-						<projectmanager-pricelist id="pl_id" onchange="window.app.infolog.et2.getWidgetById('info_price').set_value(this.options[this.selectedIndex].text.lastIndexOf('(') &lt; 0 ? '' : this.options[this.selectedIndex].text.slice(this.options[this.selectedIndex].text.lastIndexOf('(')+1,-1));" options="None" />
+						<projectmanager-pricelist id="pl_id"  options="None" />
 					</hbox>
 				</row>
 				<row>
@@ -82,7 +82,7 @@
 				<row>
 					<description value="Responsible" for="info_responsible"/>
 					<menulist width="100%">
-						<menupopup type="select-account" statustext="select a responsible user: a person you want to delegate this task" id="info_responsible" multiple="true" no_lang="1" tags="true" class="et2_fullWidth" account_type="both" empty_label="User or group" onchange="app.infolog.onchangeResponsible"/>
+						<menupopup type="select-account" statustext="select a responsible user: a person you want to delegate this task" id="info_responsible" multiple="true" no_lang="1" tags="true" class="et2_fullWidth" account_type="both" empty_label="User or group"/>
 					</menulist>
 				</row>
 				<row>
@@ -93,7 +93,7 @@
 				</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="et2_fullWidth"/>
+					<link-entry id="info_id_parent" options="infolog" class="et2_fullWidth"/>
 				</row>
 				<row>
 					<description value="Location" for="info_location"/>
@@ -107,7 +107,7 @@
 				</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'))" class="et2_fullWidth"/>
+					<date-time statustext="Date completed (leave it empty to have it automatic set if status is done or billed)" id="info_datecompleted" class="et2_fullWidth"/>
 				</row>
 				<row>
 					<description value="Contact" for="info_from"/>
@@ -164,20 +164,10 @@
 				<column/>
 			</columns>
 			<rows>
-				<row disabled="@hidebuttons" class="dialogHeadbar" >
-					<hbox  span="all" width="100%">
-						<button statustext="Apply the changes" id="button[apply]" image="apply" background_image="1"/>
-						<button statustext="delete this entry" 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" span="all"/>
-						<buttononly statustext="Insert timestamp into description field" id="timestamp" class="infologExtraButton infologTimestamp" background_image="1" image="timestamp" onclick="app.infolog.insert_text('info_des');"/>
-						<checkbox label="notification" id="no_notifications"/>
+				<row class="dialogHeadbar" >
+					<box>
 						<textbox type="integer" id="info_number" readonly="true" class="entry_id"/>
-					</hbox>
-				</row>
-				<row disabled="!@showsearchbuttons" class="dialogHeadbar">
-					<hbox span="all" width="100%">
-						<button label="Search" id="button[search]" image="search" background_image="1"/>
-						<button label="Cancel" id="button[cancelsearch]" image="cancel" background_image="1"/>
-					</hbox>
+					</box>
 				</row>
 				<row>
 					<description value="Title" for="info_subject"/>
@@ -185,12 +175,9 @@
 				</row>
 				<row>
 					<description value="Type" for="info_type"/>
-					<hbox>
-						<menulist class="et2_fullWidth">
-							<menupopup statustext="Type of the log-entry: Note, Phonecall or ToDo" id="info_type" no_lang="1" onchange="widget.getInstanceManager().submit(null,false,true); return false;" />
-						</menulist>
-						<textbox align="right" type="integer" id="info_number" readonly="true"/>
-					</hbox>
+					<menulist class="et2_fullWidth">
+						<menupopup statustext="Type of the log-entry: Note, Phonecall or ToDo" id="info_type" no_lang="1"/>
+					</menulist>
 				</row>
 				<row>
 					<description value="Contact"/>
@@ -207,13 +194,13 @@
 				<row>
 					<description value="Status" for="info_status"/>
 					<menulist class="et2_fullWidth">
-						<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'))"/>
+						<menupopup statustext="@status_help" id="info_status"/>
 					</menulist>
 				</row>
 				<row>
 					<description value="Completed" for="info_percent"/>
 					<menulist class="et2_fullWidth" span="4">
-						<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'))"/>
+						<menupopup type="select-percent" statustext="Percent completed" id="info_percent"/>
 					</menulist>
 				</row>
 				<row>