From 83f2109e40888de8f4e98663b2c95ff0ae7b04c6 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Tue, 21 Jun 2016 17:05:29 +0200
Subject: [PATCH] Mobile template: - Fix resources view template - Add general
 avatar class for view mode

---
 pixelegg/mobile/fw_mobile.css       | 10 ++++
 pixelegg/mobile/fw_mobile.less      | 10 ++++
 resources/templates/mobile/view.xet | 73 ++---------------------------
 3 files changed, 23 insertions(+), 70 deletions(-)

diff --git a/pixelegg/mobile/fw_mobile.css b/pixelegg/mobile/fw_mobile.css
index 42927dabee..1adb7eea81 100644
--- a/pixelegg/mobile/fw_mobile.css
+++ b/pixelegg/mobile/fw_mobile.css
@@ -8024,6 +8024,16 @@ form[id^="tracker-"] .dialogHeadbar {
   body .et2_mobile_view table.et2_grid tr td {
     padding: 10px 5px 10px 0;
   }
+  body .et2_mobile_view div.et2_hbox.avatar {
+    width: 100px;
+    display: block;
+    height: 100px;
+    margin: auto;
+  }
+  body .et2_mobile_view div.et2_hbox.avatar img {
+    width: 100px;
+    height: 100px;
+  }
   body .mobile-view-editBtn {
     position: fixed;
     top: 2px;
diff --git a/pixelegg/mobile/fw_mobile.less b/pixelegg/mobile/fw_mobile.less
index e1b8d740b2..ad7905a998 100644
--- a/pixelegg/mobile/fw_mobile.less
+++ b/pixelegg/mobile/fw_mobile.less
@@ -1164,6 +1164,16 @@
 					}
 				}
 			}
+			div.et2_hbox.avatar {
+				width: 100px;
+				display: block;
+				height: 100px;
+				margin: auto;
+				img {
+					width: 100px;
+					height: 100px;
+				}
+			}
 		}
 		.mobile-view-editBtn {
 			position: fixed;
diff --git a/resources/templates/mobile/view.xet b/resources/templates/mobile/view.xet
index b44511f6fc..69e3d520cb 100644
--- a/resources/templates/mobile/view.xet
+++ b/resources/templates/mobile/view.xet
@@ -2,72 +2,8 @@
 <!DOCTYPE overlay PUBLIC "-//Stylite AG//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
 <!-- $Id$ -->
 <overlay>
-	<template id="resources.view.general" template="" lang="" group="0" version="">
-		<grid width="100%">
-			<columns>
-				<column width = "120"/>
-				<column/>
-			</columns>
-			<rows>
-				<row>
-					<description value="Inventory number"/>
-					<textbox  id="inventory_number" class="et2_fullWidth"/>
-				</row>
-				<row>
-					<description value="Accessory of"/>
-					<vbox class="et2_fullWidth">
-						<menulist class="et2_fullWidth">
-							<menupopup id="accessory_of" no_lang="1" />
-						</menulist>
-						<description id="accessory_label"/>
-					</vbox>
-				</row>
-				<row>
-					<description value="Description (short)"/>
-					<textbox statustext="Short description of resource" id="short_description"  size="50" maxlength="100" class="et2_fullWidth"/>
-				</row>
-				<row>
-					<description value="Storage information"/>
-					<textbox statustext="Information about storage" id="storage_info"  maxlength="100" size="50" class="et2_fullWidth" span="all"/>
-				</row>
-				<row>
-					<description value="Location"/>
-					<textbox statustext="Where to find this resource?" id="location"  maxlength="100" size="50" class="et2_fullWidth" />
-				</row>
-				<row>
-					<description disabled="true" value="Buyable"/>
-					<checkbox disabled="true" statustext="Is resource buyable?" id="buyable" span="all" class="et2_fullWidth" />
-				</row>
-				<row>
-					<description value="Picture"/>
-					<grid>
-						<columns>
-							<column width="10%"/>
-							<column width="90%"/>
-						</columns>
-						<rows>
-
-							<row>
-								<radio id="picture_src" options="gen_src"/>
-								<description value="Use general resources icon"/>
-							</row>
-							<row>
-								<radio id="picture_src" options="cat_src"/>
-								<description value="Use the category's icon"/>
-							</row>
-							<row>
-								<radio id="picture_src" options="own_src"/>
-								<description value="Use own picture"/>
-							</row>
-
-						</rows>
-					</grid>
-				</row>
-			</rows>
-		</grid>
-	</template>
 	<template id="resources.view.page" template="" lang="" group="0" version="">
-		<htmlarea statustext="Web-Site for this resource" id="long_description" height="200" toolbar="true"/>
+		<textbox statustext="Short description of resource" id="short_description"  size="50" maxlength="100" class="et2_fullWidth"/>
 	</template>
 	<template id="resources.view.custom" template="" lang="" group="0" version="">
 		<grid width="100%" height="245" class="row_on" spacing="0" padding="0" overflow="auto">
@@ -129,9 +65,8 @@
 					<description/>
 					<box>
 						<hbox class="avatar">
-							<image src="resource_picture" href="$cont[picture_original]" expose_view="true" align="center"/>
+							<image src="picture_thumb" href="$cont[picture_original]" expose_view="true" align="center"/>
 						</hbox>
-
 					</box>
 				</row>
 				<row class="dialogHeader">
@@ -159,14 +94,12 @@
 				<row>
 					<tabbox id="tabs" span="all" width="100%" tab_height="250" align_tabs="v">
 						<tabs>
-							<tab id="page" label="Description" statustext="Informations about the location of resource"/>
-							<tab id="general" label="Details" statustext="General informations about resource"/>
+							<tab id="page" label="Description (short)" statustext="Informations about the location of resource"/>
 							<tab id="custom" label="Custom" statustext="Pictures or resource"/>
 							<tab id="ownership" label="Ownership"/>
 						</tabs>
 						<tabpanels>
 							<template id="resources.view.page"/>
-							<template id="resources.view.general"/>
 							<template id="resources.view.custom"/>
 							<template id="resources.view.ownership"/>
 						</tabpanels>