From 64cd481e9868411391cb63294af5b775a469dc49 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Fri, 4 Mar 2016 13:54:29 +0000
Subject: [PATCH] Mobile theme W.I.P: - Fix admin account tab - Switch category
 tree to taglist-cat for addressbook

---
 addressbook/templates/mobile/edit.xet | 22 +++++++--------
 admin/templates/default/acl.xet       | 24 ++++++++++++----
 admin/templates/mobile/account.xet    |  6 ++--
 admin/templates/mobile/app.css        | 33 ++++++++++++++++++++++
 admin/templates/mobile/app.less       | 40 +++++++++++++++++++++++++++
 admin/templates/pixelegg/app.css      | 21 +-------------
 admin/templates/pixelegg/app.less     | 24 ----------------
 7 files changed, 105 insertions(+), 65 deletions(-)
 create mode 100644 admin/templates/mobile/app.css
 create mode 100644 admin/templates/mobile/app.less

diff --git a/addressbook/templates/mobile/edit.xet b/addressbook/templates/mobile/edit.xet
index 6e0dc9bc9d..b898fb5abe 100644
--- a/addressbook/templates/mobile/edit.xet
+++ b/addressbook/templates/mobile/edit.xet
@@ -136,10 +136,18 @@
 				<column width="600"/>
 			</columns>
 			<rows>
+				<row>
+					<description for="category" value="Categories"/>
+					<taglist-cat id="category" class="et2_fullWidth" empty_label="Select categories"/>
+				</row>
 				<row>
 					<description value="Notes"/>
 					<textbox multiline="true" id="note" rows="10" resize_ratio="0" class="et2_fullWidth" height="200"/>
 				</row>
+				<row>
+					<description for="pubkey" value="Public key"/>
+					<textbox multiline="true" id="pubkey" rows="4" resize_ratio="0" class="et2_fullWidth"/>
+				</row>
 				<row disabled="@hidebuttons">
 					<description value="Last date"/>
 					<link id="last_link"/>
@@ -148,16 +156,6 @@
 					<description value="Next date"/>
 					<link id="next_link"/>
 				</row>
-				<row>
-					<description for="pubkey" value="Public key"/>
-					<textbox multiline="true" id="pubkey" rows="4" resize_ratio="0" class="et2_fullWidth"/>
-				</row>
-				<row disabled="!@cat_tab=Tree">
-					<tree-cat id="cat_id_tree" options="13,,width:99%"/>
-				</row>	
-				<row disabled="@cat_tab=Tree">
-					<listbox type="select-cat" id="cat_id" rows="11"/>
-				</row>
 			</rows>
 		</grid>
 	</template>
@@ -402,7 +400,7 @@
 					<description for="org_unit" value="department"/>
 					<textbox id="org_unit" onchange="app.addressbook.check_value(widget,'$cont[id]');" class="et2_fullWidth" maxlength="64"/>
 				</row>
-				
+
 				<row>
 					<description for="tel_work" value="Business phone"/>
 					<url-phone id="tel_work" class="et2_fullWidth" autocomplete="work tel" />
@@ -444,7 +442,7 @@
 					</tabbox>
 				</row>
 				<row>
-					
+
 				</row>
 			</rows>
 		</grid>
diff --git a/admin/templates/default/acl.xet b/admin/templates/default/acl.xet
index 8c1a7f4b8b..b11064e7df 100644
--- a/admin/templates/default/acl.xet
+++ b/admin/templates/default/acl.xet
@@ -60,11 +60,23 @@
 		</grid>
 	</template>
 	<template id="admin.acl" template="" lang="" group="0" version="1.9.001">
-		<vbox>
-			<nextmatch id="nm" template="admin.acl.rows" header_left="admin.acl.add"/>
-			<hbox class="dialogFooterToolbar">
-				<button label="Close" id="cancel" onclick="window.close();"/>
-			</hbox>
-		</vbox>
+		<grid width="100%">
+			<columns>
+				<column width="100%"/>
+			</columns>
+			<rows>
+				<row class="dialogHeader">
+					<description value="Access control" class=""/>
+				</row>
+				<row>
+					<nextmatch id="nm" template="admin.acl.rows" header_left="admin.acl.add" height="400"/>
+				</row>
+				<row class="dialogFooterToolbar">
+					<hbox>
+						<button label="Close" id="cancel" onclick="window.close();"/>
+					</hbox>
+				</row>
+			</rows>
+		</grid>
 	</template>
 </overlay>
diff --git a/admin/templates/mobile/account.xet b/admin/templates/mobile/account.xet
index 4dac19cdd7..e3b2f504c7 100644
--- a/admin/templates/mobile/account.xet
+++ b/admin/templates/mobile/account.xet
@@ -15,10 +15,10 @@
 				</row>
 				<row>
 					<description value="Expires" for="account_expires"/>
-					<hbox>
+					<vbox>
 						<date id="account_expires"/>
 						<checkbox id="account_status" selected_value="A" label="Account active"/>
-					</hbox>
+					</vbox>
 				</row>
 				<row>
 					<description value="Password" for="account_passwd"/>
@@ -49,7 +49,7 @@
 					<description value="Login shell" for="loginshell"/>
 					<textbox id="loginshell" class="et2_fullWidth"/>
 				</row>
-				
+
 				<row>
 					<description value="Primary group" for="account_primary_group"/>
 					<select-account id="account_primary_group" account_type="groups" class="et2_fullWidth"/>
diff --git a/admin/templates/mobile/app.css b/admin/templates/mobile/app.css
new file mode 100644
index 0000000000..076907b6f9
--- /dev/null
+++ b/admin/templates/mobile/app.css
@@ -0,0 +1,33 @@
+/**
+ *
+ * Admin - Mobile
+ *
+ * Please do NOT change app.css directly, instead change app.less and compile it!
+ * Pixleegg Template app.css
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @author Hadi Nategh <hn@stylite.de>
+ * @package admin
+ * @version $Id: app.less 55033 2016-02-16 18:49:17Z hnategh $
+ */
+/* tablets and smartphones  */
+@media all {
+  #admin-index table.egwGridView_outer tbody span[id^="admin-index"][id$='status]'] {
+    text-align: right;
+    font-size: 10pt;
+  }
+  #admin-index table.egwGridView_outer tbody .adminCol2 {
+    float: right;
+  }
+  #admin-index table.egwGridView_outer tbody .adminCol2 div {
+    text-align: right;
+  }
+  #admin-index table.egwGridView_outer tbody span[id^="admin-index"][id$='account_lid]'] {
+    font-weight: bold;
+    font-size: 12pt;
+  }
+  #admin-index table.egwGridView_outer tbody span[id^="admin-index"][id$='account_lastname]']::after {
+    content: ",";
+    font-size: 10pt;
+  }
+}
diff --git a/admin/templates/mobile/app.less b/admin/templates/mobile/app.less
new file mode 100644
index 0000000000..66f99d85fe
--- /dev/null
+++ b/admin/templates/mobile/app.less
@@ -0,0 +1,40 @@
+/**
+ *
+ * Admin - Mobile
+ *
+ * Please do NOT change app.css directly, instead change app.less and compile it!
+ * Pixleegg Template app.css
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @author Hadi Nategh <hn@stylite.de>
+ * @package admin
+ * @version $Id: app.less 55033 2016-02-16 18:49:17Z hnategh $
+ */
+@import (reference) "../../../pixelegg/less/definitions.less";
+@import (reference) "../../../pixelegg/less/def_mobile.less";
+
+/* tablets and smartphones  */
+@media all {
+	#admin-index {
+		table.egwGridView_outer tbody {
+			span[id^="admin-index"][id$='status]']{
+				text-align: right;
+				.mob-fontsize-n;
+			}
+			.adminCol2 {
+				float: right;
+				div {
+					text-align: right;
+				}
+			}
+			span[id^="admin-index"][id$='account_lid]']{
+				font-weight: bold;
+				.mob-fontsize-l;
+			}
+			span[id^="admin-index"][id$='account_lastname]']::after{
+				content:",";
+				.mob-fontsize-n;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/admin/templates/pixelegg/app.css b/admin/templates/pixelegg/app.css
index 0acad55ae1..b0c2fadc28 100755
--- a/admin/templates/pixelegg/app.css
+++ b/admin/templates/pixelegg/app.css
@@ -18,7 +18,7 @@
  * @package etemplate
  * @link http://www.egroupware.org
  * @author Ralf Becker <RalfBecker@outdoor-training.de>
- * @version $Id: app.css 53026 2015-07-01 18:35:24Z ralfbecker $
+ * @version $Id: app.css 55140 2016-02-25 08:42:33Z ralfbecker $
  */
 .admin_tree table,
 .admin_tree tr,
@@ -168,22 +168,3 @@ td.admin_userAgent span {
 #                                           #
 ##############################################*/
 }
-/* tablets and smartphones  */
-@media only screen and (max-device-width: 1024px) {
-  #admin-index table.egwGridView_outer tbody span[id^="admin-index"][id$='status]'] {
-    text-align: right;
-    font-size: 9pt;
-  }
-  #admin-index table.egwGridView_outer tbody .adminCol2 {
-    float: right;
-  }
-  #admin-index table.egwGridView_outer tbody .adminCol2 div {
-    text-align: right;
-  }
-  #admin-index table.egwGridView_outer tbody span[id^="admin-index"][id$='account_lid]'] {
-    font-weight: bold;
-  }
-  #admin-index table.egwGridView_outer tbody span[id^="admin-index"][id$='account_lastname]']::after {
-    content: ",";
-  }
-}
diff --git a/admin/templates/pixelegg/app.less b/admin/templates/pixelegg/app.less
index acf1a1d9dc..6f7d035be2 100755
--- a/admin/templates/pixelegg/app.less
+++ b/admin/templates/pixelegg/app.less
@@ -125,27 +125,3 @@ iframe#admin-index_iframe{
 } // Media
 //
 //
-
-/* tablets and smartphones  */
-@media only screen and (max-device-width:1024px) {
-	#admin-index {
-		table.egwGridView_outer tbody {
-			span[id^="admin-index"][id$='status]']{
-				text-align: right;
-				.mob-fontsize-s;
-			}
-			.adminCol2 {
-				float: right;
-				div {
-					text-align: right;
-				}
-			}
-			span[id^="admin-index"][id$='account_lid]']{
-				font-weight: bold;
-			}
-			span[id^="admin-index"][id$='account_lastname]']::after{
-				content:",";
-			}
-		}
-	}
-}
\ No newline at end of file