[eGroupWare-svn] r56006 - in /trunk: infolog/templates/mobile/ mail/templates/mobile/ pixelegg/mobile/ resources/templates/mobile/ timesheet/...
[email protected] Wed, 04 May 2016 10:02:16 -0000
| Newsgroups | gmane.comp.web.egroupware.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: hnategh
Date: Wed May 4 12:02:16 2016
New Revision: 56006
URL: http://svn.stylite.de/viewvc/egroupware?rev=56006&view=rev
Log:
Mobile theme:
- Implement resources edit dialog
- Fix resources picture is not styled
- Fix mail subject column lost its width
- Implement new id representation for entries both on view and edit dialogs
Added:
trunk/resources/templates/mobile/edit.xet
- copied, changed from r56003, trunk/resources/templates/default/edit.xet
Modified:
trunk/infolog/templates/mobile/edit.xet
trunk/mail/templates/mobile/app.css
trunk/mail/templates/mobile/app.less
trunk/mail/templates/mobile/index.xet
trunk/pixelegg/mobile/fw_mobile.css
trunk/pixelegg/mobile/fw_mobile.less
trunk/resources/templates/mobile/app.css
trunk/resources/templates/mobile/app.less
trunk/resources/templates/mobile/show.xet
trunk/timesheet/templates/mobile/edit.xet
Modified: trunk/infolog/templates/mobile/edit.xet
URL: http://svn.stylite.de/viewvc/egroupware/trunk/infolog/templates/mobile/edit.xet?rev=56006&r1=56005&r2=56006&view=diff
==============================================================================
--- trunk/infolog/templates/mobile/edit.xet (original)
+++ trunk/infolog/templates/mobile/edit.xet Wed May 4 12:02:16 2016
@@ -169,11 +169,11 @@
<rows>
<row disabled="@hidebuttons" class="dialogHeadbar" >
<hbox span="all" width="100%">
- <button statustext="Saves this entry" id="button[save]" image="save" background_image="1"/>
<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"/>
+ <textbox type="integer" id="info_number" readonly="true" class="entry_id"/>
</hbox>
</row>
<row disabled="!@showsearchbuttons" class="dialogHeadbar">
Modified: trunk/mail/templates/mobile/app.css
URL: http://svn.stylite.de/viewvc/egroupware/trunk/mail/templates/mobile/app.css?rev=56006&r1=56005&r2=56006&view=diff
==============================================================================
--- trunk/mail/templates/mobile/app.css (original)
+++ trunk/mail/templates/mobile/app.css Wed May 4 12:02:16 2016
@@ -2636,7 +2636,7 @@
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
- width: 98%;
+ width: 95%;
}
#mail-index table.egwGridView_outer tbody td span[id^='mail-index_'][id$='attachments]'] {
float: right;
@@ -2649,7 +2649,7 @@
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
- width: 98%;
+ width: 95%;
font-size: 10pt;
font-weight: normal !important;
}
Modified: trunk/mail/templates/mobile/app.less
URL: http://svn.stylite.de/viewvc/egroupware/trunk/mail/templates/mobile/app.less?rev=56006&r1=56005&r2=56006&view=diff
==============================================================================
--- trunk/mail/templates/mobile/app.less (original)
+++ trunk/mail/templates/mobile/app.less Wed May 4 12:02:16 2016
@@ -225,7 +225,7 @@
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
- width: 98%;
+ width: 95%;
}
span[id^='mail-index_'][id$='attachments]'] {
float: right;
@@ -238,7 +238,7 @@
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
- width: 98%;
+ width: 95%;
.mob-fontsize-n;
font-weight: normal !important;
}
Modified: trunk/mail/templates/mobile/index.xet
URL: http://svn.stylite.de/viewvc/egroupware/trunk/mail/templates/mobile/index.xet?rev=56006&r1=56005&r2=56006&view=diff
==============================================================================
--- trunk/mail/templates/mobile/index.xet (original)
+++ trunk/mail/templates/mobile/index.xet Wed May 4 12:02:16 2016
@@ -6,12 +6,12 @@
<grid width="100%">
<columns>
<column width="20"/>
- <column/>
+ <column width="90%"/>
<column width="80"/>
</columns>
<rows>
<row class="th">
-
+
</row>
<row>
<description class="$row_cont[class] mobile_cat_col"/>
@@ -30,7 +30,7 @@
<hbox>
<html id="${row}[attachments]"/>
</hbox>
- </vbox>
+ </vbox>
</row>
</rows>
</grid>
Modified: trunk/pixelegg/mobile/fw_mobile.css
URL: http://svn.stylite.de/viewvc/egroupware/trunk/pixelegg/mobile/fw_mobile.css?rev=56006&r1=56005&r2=56006&view=diff
==============================================================================
--- trunk/pixelegg/mobile/fw_mobile.css (original)
+++ trunk/pixelegg/mobile/fw_mobile.css Wed May 4 12:02:16 2016
@@ -8120,4 +8120,20 @@
body .cke_inner .cke_toolbox .cke_toolbox_collapser {
height: auto;
}
-}
+ body .entry_id {
+ position: absolute;
+ right: 10px;
+ top: 15px;
+ }
+ body .entry_id::before {
+ content: "#";
+ color: white;
+ font-size: 12pt;
+ font-weight: bold;
+ }
+ body .entry_id span {
+ color: white;
+ font-size: 12pt;
+ font-weight: bold;
+ }
+}
Modified: trunk/pixelegg/mobile/fw_mobile.less
URL: http://svn.stylite.de/viewvc/egroupware/trunk/pixelegg/mobile/fw_mobile.less?rev=56006&r1=56005&r2=56006&view=diff
==============================================================================
--- trunk/pixelegg/mobile/fw_mobile.less (original)
+++ trunk/pixelegg/mobile/fw_mobile.less Wed May 4 12:02:16 2016
@@ -1327,5 +1327,22 @@
}
}
}
+
+ .entry_id {
+ position: absolute;
+ right: 10px;
+ top: 15px;
+ &::before {
+ content: "#";
+ color: white;
+ .mob-fontsize-l;
+ font-weight: bold;
+ }
+ span {
+ color: white;
+ .mob-fontsize-l;
+ font-weight: bold;
+ }
+ }
}
}
Modified: trunk/resources/templates/mobile/app.css
URL: http://svn.stylite.de/viewvc/egroupware/trunk/resources/templates/mobile/app.css?rev=56006&r1=56005&r2=56006&view=diff
==============================================================================
--- trunk/resources/templates/mobile/app.css (original)
+++ trunk/resources/templates/mobile/app.css Wed May 4 12:02:16 2016
@@ -12,10 +12,6 @@
*/
/* tablets and smartphones */
@media all {
- #resources-show table.egwGridView_outer tbody img[id^="resources-show_"][id$="picture_thumb]"] {
- border: 1px solid silver;
- border-radius: 50%;
- }
#resources-show table.egwGridView_outer tbody div.resourcesCol2 {
font-size: 10pt;
}
@@ -31,4 +27,9 @@
overflow: hidden;
white-space: nowrap;
}
+ #resources-edit .resources_pictureFile .et2_file_span {
+ text-align: center;
+ width: 120px;
+ margin-left: 120px;
+ }
}
Modified: trunk/resources/templates/mobile/app.less
URL: http://svn.stylite.de/viewvc/egroupware/trunk/resources/templates/mobile/app.less?rev=56006&r1=56005&r2=56006&view=diff
==============================================================================
--- trunk/resources/templates/mobile/app.less (original)
+++ trunk/resources/templates/mobile/app.less Wed May 4 12:02:16 2016
@@ -17,10 +17,6 @@
@media all {
#resources-show {
table.egwGridView_outer tbody {
- img[id^="resources-show_"][id$="picture_thumb]"]{
- border: 1px solid silver;
- border-radius: 50%;
- }
div.resourcesCol2 {
.mob-fontsize-n;
}
@@ -38,4 +34,11 @@
}
}
}
+ #resources-edit {
+ .resources_pictureFile .et2_file_span {
+ text-align: center;
+ width: 120px;
+ margin-left: 120px;
+ }
+ }
}
Copied: trunk/resources/templates/mobile/edit.xet (from r56003, trunk/resources/templates/default/edit.xet)
URL: http://svn.stylite.de/viewvc/egroupware/trunk/resources/templates/mobile/edit.xet?p2=trunk/resources/templates/mobile/edit.xet&p1=trunk/resources/templates/default/edit.xet&r1=56003&r2=56006&rev=56006&view=diff
==============================================================================
--- trunk/resources/templates/default/edit.xet (original)
+++ trunk/resources/templates/mobile/edit.xet Wed May 4 12:02:16 2016
@@ -3,23 +3,19 @@
<!-- $Id$ -->
<overlay>
<template id="resources.edit_tabs.general" template="" lang="" group="0" version="">
- <grid width="100%" height="245">
- <columns>
- <column width="80"/>
- <column width="200"/>
- <column width="75"/>
- <column width="90"/>
- <column width="10"/>
- <column width="30"/>
- <column width="50"/>
+ <grid width="100%">
+ <columns>
+ <column width = "120"/>
+ <column/>
</columns>
<rows>
<row>
<description value="Inventory number"/>
<textbox id="inventory_number" class="et2_fullWidth"/>
- <description/>
+ </row>
+ <row>
<description value="Accessory of"/>
- <vbox span="all" class="et2_fullWidth">
+ <vbox class="et2_fullWidth">
<menulist class="et2_fullWidth">
<menupopup id="accessory_of" no_lang="1" />
</menulist>
@@ -28,26 +24,29 @@
</row>
<row>
<description value="Description (short)"/>
- <textbox statustext="Short description of resource" id="short_description" size="50" maxlength="100" class="et2_fullWidth"/>
- <description/>
+ <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" size="50" maxlength="100" class="et2_fullWidth" span="all"/>
+ <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" size="50" maxlength="100" class="et2_fullWidth" />
- <description/>
+ <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 width="100%">
+ <grid>
<columns>
<column width="10%"/>
<column width="90%"/>
</columns>
<rows>
+
<row>
<radio id="picture_src" options="gen_src"/>
<description value="Use general resources icon"/>
@@ -60,29 +59,18 @@
<radio id="picture_src" options="own_src"/>
<description value="Use own picture"/>
</row>
- <row>
- <description/>
- <file id="own_file" class="resources_pictureFile et2_fullWidth" onchange="app.resources.select_picture_src"/>
- </row>
+
</rows>
</grid>
- <description/>
- <image src="resource_picture" href="$cont[picture_original]" expose_view="true" align="center"/>
+ </row>
+ <row>
+ <file id="own_file" class="resources_pictureFile" onchange="app.resources.select_picture_src"/>
</row>
</rows>
</grid>
</template>
<template id="resources.edit_tabs.page" template="" lang="" group="0" version="">
- <grid width="100%" height="100%" overflow="auto">
- <columns>
- <column/>
- </columns>
- <rows>
- <row valign="top">
- <htmlarea statustext="Web-Site for this resource" id="long_description" height="200" toolbar="true" imageUpload="link_to"/>
- </row>
- </rows>
- </grid>
+ <htmlarea statustext="Web-Site for this resource" id="long_description" height="200" toolbar="true" imageUpload="link_to"/>
</template>
<template id="resources.edit_tabs.links" template="" lang="" group="0" version="">
<grid width="100%" height="245" overflow="auto">
@@ -118,65 +106,13 @@
</rows>
</grid>
</template>
- <template id="resources.edit_tabs.history" template="" lang="" group="0" version="">
- <historylog id="history" width="100%"/>
- </template>
- <template id="resources.edit" template="" lang="" group="0" version="1.9.002">
+ <template id="resources.edit_tabs.ownership" template="" lang="" group="0" version="">
<grid width="100%">
<columns>
- <column width="90"/>
- <column width="200"/>
- <column width="80"/>
- <column width="90"/>
- <column width="120"/>
- <column width="30"/>
- <column width="50"/>
- <column width="4"/>
- </columns>
- <rows>
- <row class="dialogHeader">
- <description value="Name"/>
- <textbox statustext="Name of resource" id="name" needed="1" class="et2_fullWidth et2_required" span="4"/>
- <textbox type="integer" id="res_id" readonly="true"/>
- <appicon/>
- <description/>
- </row>
- <row class="dialogHeader2">
- <description value="Quantity"/>
- <textbox statustext="Quantity of resource" id="quantity" size="5" maxlength="10" class="et2_fullWidth"/>
- <description/>
- <description value="Category"/>
- <menulist span="3">
- <menupopup align="right" statustext="Which category does this resource belong to?" id="cat_id" needed="1" no_lang="1" class="et2_fullWidth" />
- </menulist>
- <description/>
- </row>
- <row class="dialogHeader3">
- <description value="Usable"/>
- <textbox statustext="How many of them are useable?" id="useable" size="5" maxlength="10" class="et2_fullWidth"/>
- <description/>
- <description value="Bookable"/>
- <checkbox statustext="Is resource bookable?" id="bookable" span="3"/>
- <description/>
- </row>
- <row>
- <tabbox id="tabs" span="all" width="100%" tab_height="250">
- <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="links" label="Links" statustext="Web-Page of resource"/>
- <tab id="custom" label="Custom" statustext="Pictures or resource"/>
- <tab id="history" label="History"/>
- </tabs>
- <tabpanels>
- <template id="resources.edit_tabs.page"/>
- <template id="resources.edit_tabs.general"/>
- <template id="resources.edit_tabs.links"/>
- <template id="resources.edit_tabs.custom"/>
- <template id="resources.edit_tabs.history"/>
- </tabpanels>
- </tabbox>
- </row>
+ <column width = "120"/>
+ <column/>
+ </columns>
+ <rows>
<row class="dialogOperators">
<description value="Created by"/>
<hbox>
@@ -194,14 +130,74 @@
<date-time id="res_modified" readonly="true" align="right"/>
</hbox>
</row>
- <row class="dialogFooterToolbar">
- <hbox span="3">
- <button statustext="Saves entry and exits" label="Save" id="button[save]" image="save" background_image="1"/>
- <button label="Apply" id="button[apply]" image="apply" background_image="1"/>
- <button label="Cancel" id="button[cancel]" onclick="window.close();" image="close" background_image="1"/>
+ </rows>
+ </grid>
+ </template>
+ <template id="resources.edit" template="" lang="" group="0" version="1.9.002">
+ <grid width="100%">
+ <columns>
+ <column width = "120"/>
+ <column/>
+ </columns>
+ <rows>
+ <row class="dialogHeadbar" >
+ <hbox>
+ <button id="button[apply]" image="apply" background_image="1"/>
+ <button id="button[delete]" onclick="et2_dialog.confirm(widget,'Do you really want do delte this resource?','Delete')" image="delete" background_image="1"/>
+ <textbox type="integer" id="res_id" readonly="true" class="entry_id"/>
</hbox>
- <button align="right" label="Delete" id="button[delete]" onclick="et2_dialog.confirm(widget,'Do you really want do delte this resource?','Delete')" image="delete" background_image="1"/>
- </row>
+ </row>
+ <row>
+ <description/>
+ <box>
+ <hbox class="avatar">
+ <image src="resource_picture" href="$cont[picture_original]" expose_view="true" align="center"/>
+ </hbox>
+
+ </box>
+ </row>
+ <row class="dialogHeader">
+ <description value="Name"/>
+ <textbox statustext="Name of resource" id="name" needed="1" class="et2_fullWidth et2_required" span="4"/>
+ </row>
+ <row>
+ <description value="Quantity"/>
+ <textbox statustext="Quantity of resource" id="quantity" size="5" maxlength="10" class="et2_fullWidth"/>
+ </row>
+ <row>
+ <description value="Category"/>
+ <menulist span="3">
+ <menupopup align="right" statustext="Which category does this resource belong to?" id="cat_id" needed="1" no_lang="1" class="et2_fullWidth" />
+ </menulist>
+ </row>
+ <row>
+ <description value="Usable"/>
+ <textbox statustext="How many of them are useable?" id="useable" size="5" maxlength="10" class="et2_fullWidth"/>
+ </row>
+ <row>
+ <description value="Bookable"/>
+ <checkbox statustext="Is resource bookable?" id="bookable" span="3"/>
+ </row>
+ <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="links" label="Links" statustext="Web-Page of resource"/>
+ <tab id="custom" label="Custom" statustext="Pictures or resource"/>
+ <tab id="ownership" label="Ownership"/>
+ </tabs>
+ <tabpanels>
+ <template id="resources.edit_tabs.page"/>
+ <template id="resources.edit_tabs.general"/>
+ <template id="resources.edit_tabs.links"/>
+ <template id="resources.edit_tabs.custom"/>
+ <template id="resources.edit_tabs.ownership"/>
+ </tabpanels>
+ </tabbox>
+ </row>
+
+
</rows>
</grid>
</template>
Modified: trunk/resources/templates/mobile/show.xet
URL: http://svn.stylite.de/viewvc/egroupware/trunk/resources/templates/mobile/show.xet?rev=56006&r1=56005&r2=56006&view=diff
==============================================================================
--- trunk/resources/templates/mobile/show.xet (original)
+++ trunk/resources/templates/mobile/show.xet Wed May 4 12:02:16 2016
@@ -15,7 +15,7 @@
</columns>
<rows>
<row class="th">
-
+
</row>
<row class="$row_cont[class]">
<description class="cat_$row_cont[cat_id] mobile_cat_col"/>
@@ -50,7 +50,9 @@
</menulist>
</vbox>
<vbox>
- <image id="${row}[picture_thumb]" width="50px" height="50px" expose_view="true" href="$row_cont[picture_original]" src="${row}[picture_thumb]" />
+ <hbox class="avatar">
+ <image id="${row}[picture_thumb]" width="50px" height="50px" expose_view="true" href="$row_cont[picture_original]" src="${row}[picture_thumb]" />
+ </hbox>
</vbox>
</row>
</rows>
@@ -100,7 +102,7 @@
</rows>
</grid>
<styles>
-
+
div.action_popup[id] {
position: fixed;
top: 200px;
Modified: trunk/timesheet/templates/mobile/edit.xet
URL: http://svn.stylite.de/viewvc/egroupware/trunk/timesheet/templates/mobile/edit.xet?rev=56006&r1=56005&r2=56006&view=diff
==============================================================================
--- trunk/timesheet/templates/mobile/edit.xet (original)
+++ trunk/timesheet/templates/mobile/edit.xet Wed May 4 12:02:16 2016
@@ -114,9 +114,9 @@
<row disabled="@hidebuttons" class="dialogHeadbar" >
<hbox span="all" width="100%">
<button statustext="Saves this entry and add a new one" id="button[save_new]" image="save_new" background_image="1"/>
- <button statustext="Saves the changes made" id="button[save]" image="save" background_image="1"/>
<button statustext="Applies the changes made" id="button[apply]" image="apply" background_image="1"/>
<button statustext="Delete this entry" id="button[delete]" onclick="et2_dialog.confirm(widget,'Delete this entry','Delete')" image="delete" background_image="1"/>
+ <textbox type="integer" id="ts_id" readonly="true" class="entry_id"/>
</hbox>
</row>
<row disabled="!@showsearchbuttons" class="dialogHeadbar">
@@ -131,10 +131,7 @@
</row>
<row>
<description value="Date"/>
- <hbox>
- <date id="ts_start" needed="1" options=",8"/>
- <textbox align="right" type="integer" id="ts_id" readonly="true"/>
- </hbox>
+ <date id="ts_start" needed="1" options=",8"/>
</row>
<row>
<description value="Starttime"/>
------------------------------------------------------------------------------
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z