forked from extern/egroupware
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
This commit is contained in:
parent
c6bda1524f
commit
62b3632073
@ -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">
|
||||
|
@ -2636,7 +2636,7 @@ div.mailComposeHeaderSection > table {
|
||||
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 @@ div.mailComposeHeaderSection > table {
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
width: 98%;
|
||||
width: 95%;
|
||||
font-size: 10pt;
|
||||
font-weight: normal !important;
|
||||
}
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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>
|
||||
|
@ -8120,4 +8120,20 @@ form[id^="tracker-"] .dialogHeadbar {
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
204
resources/templates/mobile/edit.xet
Normal file
204
resources/templates/mobile/edit.xet
Normal file
@ -0,0 +1,204 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE overlay PUBLIC "-//Stylite AG//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
|
||||
<!-- $Id$ -->
|
||||
<overlay>
|
||||
<template id="resources.edit_tabs.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>
|
||||
<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="">
|
||||
<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">
|
||||
<columns>
|
||||
<column width="100"/>
|
||||
<column/>
|
||||
</columns>
|
||||
<rows>
|
||||
<row class="row">
|
||||
<link-to id="link_to" span="all"/>
|
||||
</row>
|
||||
<row class="th">
|
||||
<description value="Existing links" span="all"/>
|
||||
</row>
|
||||
<row class="row_off" valign="top">
|
||||
<link-list id="link_to" span="all"/>
|
||||
</row>
|
||||
</rows>
|
||||
</grid>
|
||||
</template>
|
||||
<template id="resources.edit_tabs.custom" template="" lang="" group="0" version="">
|
||||
<grid width="100%" height="245" class="row_on" spacing="0" padding="0" overflow="auto">
|
||||
<columns>
|
||||
<column/>
|
||||
</columns>
|
||||
<rows>
|
||||
<row class="th" height="20">
|
||||
<description value="Custom fields"/>
|
||||
</row>
|
||||
<row valign="top">
|
||||
<customfields/>
|
||||
</row>
|
||||
</rows>
|
||||
</grid>
|
||||
</template>
|
||||
<template id="resources.edit_tabs.ownership" template="" lang="" group="0" version="">
|
||||
<grid width="100%">
|
||||
<columns>
|
||||
<column width = "120"/>
|
||||
<column/>
|
||||
</columns>
|
||||
<rows>
|
||||
<row class="dialogOperators">
|
||||
<description value="Created by"/>
|
||||
<hbox>
|
||||
<menulist>
|
||||
<menupopup type="select-account" id="res_owner" readonly="true"/>
|
||||
</menulist>
|
||||
<date-time id="res_created" readonly="true" align="right"/>
|
||||
</hbox>
|
||||
<description/>
|
||||
<description value="Last modified"/>
|
||||
<hbox>
|
||||
<menulist>
|
||||
<menupopup type="select-account" id="res_modifier" readonly="true"/>
|
||||
</menulist>
|
||||
<date-time id="res_modified" readonly="true" align="right"/>
|
||||
</hbox>
|
||||
</row>
|
||||
</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>
|
||||
</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>
|
||||
</overlay>
|
@ -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;
|
||||
|
@ -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"/>
|
||||
|
Loading…
Reference in New Issue
Block a user