WIP Mobile template: Fix some of apps add buttons

addressbook/templates/mobile/index.xet

@@ -2,15 +2,11 @@
 <!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
 <!-- $Id$ -->
 <overlay>
-	<template id="addressbook.index.left" template="" lang="" group="0" version="1.3.001">
-
-	</template>
 	<template id="addressbook.index.right_add" template="" lang="" group="0" version="1.7.001">
 		<hbox>
 			<menulist>
 				<menupopup align="right" label="Type" id="col_filter[tid]" empty_label="All"/>
 			</menulist>
-			<buttononly class="plus_button" align="right" parent_node="addressbook-index_plus_button_container" statustext="Add a new contact" id="plus_button" onclick="egw(window).openPopup(egw::link('/index.php','menuaction=addressbook.addressbook_ui.edit'),'850','440','_blank','addressbook',null,true); return false;"/>
 		</hbox>
 	</template>
 	<template id="addressbook.index.rows" template="" lang="" group="0" version="1.9.005">
@@ -71,7 +67,9 @@
 					<template align="right" id="addressbook.index.right_add"/>
 				</row>
 				<row>
-					<description width="0" id="plus_button_container" />
+					<hbox>
+						<buttononly class="plus_button" size="large" statustext="Add a new contact" id="plus_button" onclick="egw(window).openPopup(egw::link('/index.php','menuaction=addressbook.addressbook_ui.edit'),'850','440','_blank','addressbook',null,true); return false;"/>
+					</hbox>
 				</row>
 				<row>
 					<nextmatch id="nm" template="addressbook.index.rows" header_right="addressbook.index.right_add" span="all"/>

admin/templates/mobile/app.css

@@ -34,3 +34,4 @@
     display: none;
   }
 }
+/*# sourceMappingURL=app.css.map */

admin/templates/mobile/index.xet

@@ -2,9 +2,6 @@
 <!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
 <!-- $Id$ -->
 <overlay>
-	<template id="admin.index.add" template="" lang="" group="0" version="1.9.001">
-		<buttononly class="plus_button" id="add" parent_node="admin-index_plus_button_container" onclick='app.admin.account({id:"add"})'/>
-	</template>
 	<template id="admin.index.rows" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
 			<columns>
@@ -68,7 +65,8 @@
 	<template id="admin.index" template="" lang="" group="0" version="1.9.001">
 		<tree autoloading="admin_ui::ajax_tree" id="tree" onclick="app.admin.run" parent_node="admin_tree_target" std_images="bullet"/>
 		<description id="plus_button_container"/>
-		<nextmatch id="nm" template="admin.index.rows" header_right="admin.index.add"/>
+		<buttononly class="plus_button" id="add" onclick='app.admin.account({id:"add"})'/>
+		<nextmatch id="nm" template="admin.index.rows"/>
 		<nextmatch id="groups" template="admin.index.group"/>
 		<iframe frameborder="1" height="100%" id="iframe" scrolling="auto" width="100%" disabled="true"/>
 		<box id="ajax_target" height="99%" disabled="true"/>

infolog/templates/mobile/app.css

@@ -111,3 +111,4 @@
     right: 0;
   }
 }
+/*# sourceMappingURL=app.css.map */

infolog/templates/mobile/index.xet

@@ -2,9 +2,6 @@
 <!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
 <!-- $Id$ -->
 <overlay>
-	<template id="infolog.index.header_right" template="" lang="" group="0" version="1.9.001">
-		<button class="plus_button" parent_node="infolog-index_plus_button_container" statustext="Add a new ToDo" id="add[task]" onclick="app.infolog.add_with_extras(widget,'task','$cont[action]','$cont[action_id]');"/>
-	</template>
 	<template id="infolog.index.dates" template="" lang="" group="0" version="1.9.001">
 		<hbox>
 			<date id="startdate" label="Start"/>
@@ -52,6 +49,7 @@
 		</grid>
 	</template>
 	<template id="infolog.index" template="" lang="" group="0" version="1.9.005">
+		<button class="plus_button" statustext="Add a new ToDo" id="add[task]" onclick="app.infolog.add_with_extras(widget,'task','$cont[action]','$cont[action_id]');"/>
 		<grid width="100%" border="0" spacing="0" padding="0">
 			<columns>
 				<column width="70%"/>
@@ -69,10 +67,7 @@
 					<template id="header_right"/>
 				</row>
 				<row>
-					<description id="plus_button_container"/>
+					<nextmatch id="nm" template="infolog.index.rows" header_left="infolog.index.dates" span="all"/>
-				</row>
-				<row>
-					<nextmatch id="nm" template="infolog.index.rows" header_right='infolog.index.header_right' header_left="infolog.index.dates" span="all"/>
 				</row>
 				<row>
 					<hbox class=" ">

mail/templates/mobile/app.less

@@ -15,7 +15,7 @@
 
 @import (reference) "../../../pixelegg/less/def_buttons.less";
 @import (reference) "../../../pixelegg/less/def_mobile.less";
-@import "../pixelegg/app.less";
+@import "../default/app.css";
 /* import */
 /* tablets and smartphones  */
 @media all {

mail/templates/mobile/index.xet

@@ -42,12 +42,11 @@
 	<template id="mail.index" template="" lang="" group="0" version="1.9.001">
 		<tree autoloading="mail.mail_ui.ajax_foldertree" id="nm[foldertree]" onclick="app.mail.mail_changeFolder" parent_node="mail-tree_target"/>
 		<html id="msg"/>
-		<buttononly id="composeButton" class="plus_button" onclick="app.mail.mail_compose(false);" parent_node="mail-index_msg"/>
-		<buttononly id="button[mailcreate]" onclick="app.mail.mail_compose(false);" label="Compose" parent_node="mail-index_buttonmailcreate"/>
 		<hbox class="mail-index_vacation"><vbox>
 			<description id="nm[vacationnotice]" class="@nm[vacationclass]"/>
 			<description id="nm[vacationrange]" class="@nm[vacationrangeclass]"/></vbox>
 		</hbox>
 		<nextmatch id="nm" onselect="app.mail.mail_preview" template="mail.index.rows" right_header="mail.index.header_right"/>
+		<buttononly id="button[mailcreate]" class="plus_button" onclick="app.mail.mail_compose(false);" size="large" image="plus" circle="true"/>
 	</template>
 </overlay>

pixelegg/css/mobile.css

@@ -1060,18 +1060,6 @@
                     margin: 2px !important;
                     min-height: 19px;*/
   }
-  div.ui-toolbar-menulist {
-    position: absolute;
-    height: inherit;
-    z-index: 999 !important;
-    overflow: hidden !important;
-    border: solid black 1px;
-    padding: 0 !important;
-    margin-top: 3px !important;
-  }
-  .ui-toolbar-menulist > h {
-    padding-bottom: 7px;
-  }
   .ui-toolbar-menulistHeader {
     font-size: xx-small;
     height: 100%;
@@ -1142,34 +1130,6 @@
   .et2_toolbar span.et2_checkbox_slideSwitch.switchOn {
     filter: none;
   }
-  /*#################################### ADMIN PART #####################################################*/
-  iframe#admin-index_iframe {
-    background-color: yellow;
-  }
-  table.egwGridView_grid img {
-    /*filter grey*/
-    /*filter grey*/
-    filter: none;
-    -webkit-filter: initial;
-    -moz-filter: initial;
-    -ms-filter: initial;
-    -o-filter: initial;
-    /*filter: url(grayscale.svg);  Firefox 4+ */
-    filter: initial;
-    /* IE 6-9 */
-  }
-  .admin_aclAPP {
-    /*filter grey*/
-    filter: none;
-    -webkit-filter: initial;
-    -moz-filter: initial;
-    -ms-filter: initial;
-    -o-filter: initial;
-    /*filter: url(grayscale.svg);  Firefox 4+ */
-    filter: initial;
-    /* IE 6-9 */
-  }
-  /*#################################### END ADMIN PART #####################################################*/
 }
 /*#################################### Media Queries #####################################################*/
 @media only screen and (min-width: 980px) and (max-width: 1279px) {
@@ -3221,9 +3181,16 @@ div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub
   color: #373f3f;
 }
 div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item_selected {
-  background-color: rgba(153, 204, 255, 0.4) !important;
+  background-color: hsl(200, 98%, 39%) !important;
   background-image: none !important;
 }
+div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item_selected td.sub_item_icon img.sub_icon {
+  filter: invert(1) brightness(5);
+}
+div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item_selected div.sub_item_text,
+div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item_selected td.sub_item_hk div.sub_item_hk {
+  color: hsl(0, 0%, 100%);
+}
 div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl div.sub_sep {
   border-top: 1px solid #E6E6E6;
 }
@@ -3325,9 +3292,6 @@ table.dialog-main-view {
   color: #000000;
   border-bottom: 3px solid #696969;
 }
-.dialogHeader img[src*="navbar"] {
-  padding: 0 0 0 15px;
-}
 .dialogHeader input[type="radio"],
 .dialogHeader input.et2_radiobox {
   -webkit-appearance: none;
@@ -3505,9 +3469,6 @@ div#etemplate\.tab_widget {
 .dialogFooterToolbar td {
   padding: 5px 5px 0px 0px;
 }
-.dialogFooterToolbar td:first-child {
-  padding-left: 5px;
-}
 .dialogFooterToolbar button {
   min-width: 86px;
   height: 24px;
@@ -4292,10 +4253,8 @@ span.overlayContainer img.overlay {
   z-index: 1001;
   top: 46px;
   background: white;
-  box-shadow: 2px 3px 13px #666666;
+  box-shadow: 0 2px 8px hsla(240, 3.8%, 46.1%, 0.12);
-  -moz-box-shadow: 2px 3px 13px #666666;
+  border: 1px solid hsl(240, 6%, 90%);
-  -webkit-box-shadow: 2px 3px 13px #666666;
-  -khtml-box-shadow: 2px 3px 13px #666666;
 }
 #egw_fw_header #egw_fw_topmenu a.powered_by {
   width: calc(100% - 20px);
@@ -4392,13 +4351,16 @@ span.overlayContainer img.overlay {
   border-top: #E6E6E6;
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li:hover {
-  background: rgba(153, 204, 255, 0.4);
+  background: hsl(200, 98%, 39%);
-  color: #FFFFFF;
+  color: hsl(0, 0%, 100%);
+}
+#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li:hover a {
+  filter: invert(1) brightness(5);
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li a {
   color: #000000;
   text-decoration: none;
-  font-size: 12px;
+  font-size: 11px;
   padding-left: 26px;
   line-height: 1.5em;
   display: inline-block;

pixelegg/mobile/fw_mobile.css

@@ -1071,18 +1071,6 @@
                     margin: 2px !important;
                     min-height: 19px;*/
   }
-  div.ui-toolbar-menulist {
-    position: absolute;
-    height: inherit;
-    z-index: 999 !important;
-    overflow: hidden !important;
-    border: solid black 1px;
-    padding: 0 !important;
-    margin-top: 3px !important;
-  }
-  .ui-toolbar-menulist > h {
-    padding-bottom: 7px;
-  }
   .ui-toolbar-menulistHeader {
     font-size: xx-small;
     height: 100%;
@@ -1153,34 +1141,6 @@
   .et2_toolbar span.et2_checkbox_slideSwitch.switchOn {
     filter: none;
   }
-  /*#################################### ADMIN PART #####################################################*/
-  iframe#admin-index_iframe {
-    background-color: yellow;
-  }
-  table.egwGridView_grid img {
-    /*filter grey*/
-    /*filter grey*/
-    filter: none;
-    -webkit-filter: initial;
-    -moz-filter: initial;
-    -ms-filter: initial;
-    -o-filter: initial;
-    /*filter: url(grayscale.svg);  Firefox 4+ */
-    filter: initial;
-    /* IE 6-9 */
-  }
-  .admin_aclAPP {
-    /*filter grey*/
-    filter: none;
-    -webkit-filter: initial;
-    -moz-filter: initial;
-    -ms-filter: initial;
-    -o-filter: initial;
-    /*filter: url(grayscale.svg);  Firefox 4+ */
-    filter: initial;
-    /* IE 6-9 */
-  }
-  /*#################################### END ADMIN PART #####################################################*/
 }
 /*#################################### Media Queries #####################################################*/
 @media only screen and (min-width: 980px) and (max-width: 1279px) {
@@ -3232,9 +3192,16 @@ div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub
   color: #373f3f;
 }
 div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item_selected {
-  background-color: rgba(153, 204, 255, 0.4) !important;
+  background-color: hsl(200, 98%, 39%) !important;
   background-image: none !important;
 }
+div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item_selected td.sub_item_icon img.sub_icon {
+  filter: invert(1) brightness(5);
+}
+div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item_selected div.sub_item_text,
+div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub_item_selected td.sub_item_hk div.sub_item_hk {
+  color: hsl(0, 0%, 100%);
+}
 div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl div.sub_sep {
   border-top: 1px solid #E6E6E6;
 }
@@ -3336,9 +3303,6 @@ table.dialog-main-view {
   color: #000000;
   border-bottom: 3px solid #696969;
 }
-.dialogHeader img[src*="navbar"] {
-  padding: 0 0 0 15px;
-}
 .dialogHeader input[type="radio"],
 .dialogHeader input.et2_radiobox {
   -webkit-appearance: none;
@@ -3516,9 +3480,6 @@ div#etemplate\.tab_widget {
 .dialogFooterToolbar td {
   padding: 5px 5px 0px 0px;
 }
-.dialogFooterToolbar td:first-child {
-  padding-left: 5px;
-}
 .dialogFooterToolbar button {
   min-width: 86px;
   height: 24px;
@@ -4303,10 +4264,8 @@ span.overlayContainer img.overlay {
   z-index: 1001;
   top: 46px;
   background: white;
-  box-shadow: 2px 3px 13px #666666;
+  box-shadow: 0 2px 8px hsla(240, 3.8%, 46.1%, 0.12);
-  -moz-box-shadow: 2px 3px 13px #666666;
+  border: 1px solid hsl(240, 6%, 90%);
-  -webkit-box-shadow: 2px 3px 13px #666666;
-  -khtml-box-shadow: 2px 3px 13px #666666;
 }
 #egw_fw_header #egw_fw_topmenu a.powered_by {
   width: calc(100% - 20px);
@@ -4403,13 +4362,16 @@ span.overlayContainer img.overlay {
   border-top: #E6E6E6;
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li:hover {
-  background: rgba(153, 204, 255, 0.4);
+  background: hsl(200, 98%, 39%);
-  color: #FFFFFF;
+  color: hsl(0, 0%, 100%);
+}
+#egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li:hover a {
+  filter: invert(1) brightness(5);
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li a {
   color: #000000;
   text-decoration: none;
-  font-size: 12px;
+  font-size: 11px;
   padding-left: 26px;
   line-height: 1.5em;
   display: inline-block;
@@ -8498,7 +8460,7 @@ table.egwGridView_grid img.et2_appicon {
   body .ui-dialog .ui-dialog-titlebar .ui-dialog-titlebar-close {
     display: none;
   }
-  body button.plus_button {
+  body et2-button.plus_button {
     position: fixed !important;
     right: 15px;
     bottom: 15px;
@@ -8515,10 +8477,13 @@ table.egwGridView_grid img.et2_appicon {
     margin: 0;
     padding: 0;
   }
-  body button.plus_button:hover,
+  body et2-button.plus_button:hover,
-  body button.plus_button:active {
+  body et2-button.plus_button:active {
     background-color: #0c5da5;
   }
+  body et2-button.plus_button::part(base) {
+    display: none;
+  }
   body .et2_nextmatch .nextmatch_sortheader {
     padding-right: 0px;
     margin-right: 0px;

pixelegg/mobile/fw_mobile.less

@@ -630,7 +630,7 @@
 				display: none;
 			}
 		}
-		button.plus_button {
+		et2-button.plus_button {
 			position: fixed !important;
 			right: 15px;
 			bottom: 15px;
@@ -650,6 +650,7 @@
 				background-color: #0c5da5;
 			}
 		}
+		et2-button.plus_button::part(base) {display: none;}
 		.et2_nextmatch {
 			.nextmatch_sortheader {
 				padding-right: 0px;
@@ -878,6 +879,9 @@
 
 					&:focus{
 						outline:none;
+					}
+					et2-favorites {
+
 					}
 					div[name="favorite"] {
 

preferences/templates/mobile/app.css

@@ -24,7 +24,7 @@ table.prefTable {
   width: 100%;
 }
 table.prefTable tbody tr.prefRow:first-child > .prefHelpColumn {
-  background-image: url(../../../api/templates/default/images/hint.png);
+  background-image: url(../../../api/templates/default/images/dialog_info.png);
   background-repeat: no-repeat;
   background-position: center;
   height: 99%;
@@ -43,7 +43,7 @@ tr.prefRow > td.prefValueColumn {
 }
 /*.prefValueColumn {border-right:none !important;}*/
 .prefHelpColumn {
-  border: none !important;
+  border-left: 1px solid #e6e6e6 !important;
   padding: 0 !important;
 }
 .prefHelp {
@@ -70,14 +70,13 @@ tr.prefRow:hover .prefHelp {
 }
 .prefValue {
   margin-right: 5px;
-  width: 49%;
+  width: 99%;
 }
-.prefDefault {
+span.prefDefault {
-  float: right;
-  width: 48%;
   overflow-x: hidden;
   text-overflow: ellipsis;
-  max-width: 300px;
+  padding-bottom: 5px;
+  color: silver;
 }
 .prefValue textarea,
 textarea.prefValue {
@@ -89,6 +88,7 @@ textarea.prefValue {
   font-size: 150%;
   margin-top: 10px;
   margin-right: 5px;
+  position: relative;
 }
 .prefType {
   width: 49%;
@@ -105,9 +105,6 @@ textarea.prefValue {
 .prefValueColumn select.prefValue {
   white-space: pre-line;
 }
-#preferences_settings_country_chzn {
-  width: 49% !important;
-}
 /**
  * 2FA setup
  */
@@ -130,6 +127,9 @@ img.qrCode {
   font-style: italic;
   font-size: 120%;
 }
+table.prefTable tbody tr.prefRow .prefHelpColumn {
+  border-bottom: none;
+}
 .prefHelp {
   width: 100%;
   height: 60px;
@@ -162,3 +162,4 @@ div#preferences-settings_tabs {
     background-position: center !important;
   }
 }
+/*# sourceMappingURL=app.css.map */

timesheet/templates/mobile/app.css

@@ -56,3 +56,4 @@
     word-break: break-all;
   }
 }
+/*# sourceMappingURL=app.css.map */

timesheet/templates/mobile/index.xet

@@ -10,9 +10,6 @@
 			<date statustext="Leave it empty for a full week" id="enddate"/>
 		</hbox>
 	</template>
-	<template id="timesheet.index.add" template="" lang="" group="0" version="1.7.001">
-		<buttononly id="add"  class="plus_button" onclick="egw.open('timesheet');" parent_node="timesheet-index_plus_button_container"/>
-	</template>
 	<template id="timesheet.index.rows" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
 			<columns>
@@ -52,6 +49,7 @@
 	</template>
 	<template id="timesheet.index" template="" lang="" group="0" version="1.9.001">
 		<description id="plus_button_container"/>
-		<nextmatch id="nm" options="timesheet.index.rows" header_right="timesheet.index.add" header_left="timesheet.index.dates"/>
+		<nextmatch id="nm" options="timesheet.index.rows" header_left="timesheet.index.dates"/>
+		<buttononly id="add"  class="plus_button" onclick="egw.open('timesheet');" />
 	</template>
 </overlay>