R55633 - in /trunk: pixelegg/mobile/ projectmanager/templates/mobile/

hnategh-2 2016-04-05 16:33:17 UTC #1

Author: hnategh
New Revision: 55633

URL: http://svn.stylite.de/viewvc/egroupware?rev=55633&view=rev
Log:
Mobile theme W.I.P.:

Add edit dialog for projectmanager
Fix bad margins applied to input field
Switch column in projectmanager list view

Added:
trunk/projectmanager/templates/mobile/app.css
trunk/projectmanager/templates/mobile/app.less
trunk/projectmanager/templates/mobile/edit.xet
Modified:
trunk/pixelegg/mobile/fw_mobile.css
trunk/pixelegg/mobile/fw_mobile.less
trunk/projectmanager/templates/mobile/list.xet

Modified: trunk/pixelegg/mobile/fw_mobile.css
URL: http://svn.stylite.de/viewvc/egroupware/trunk/pixelegg/mobile/fw_mobile.css?rev=55633&r1=55632&r2=55633&view=diff

— trunk/pixelegg/mobile/fw_mobile.css (original)
+++ trunk/pixelegg/mobile/fw_mobile.css Tue Apr 5 18:33:17 2016
@@ -7919,6 +7919,9 @@
body .popupMainDiv .et2_taglist > div {
min-height: auto;
}

body .popupMainDiv form.et2_container div table.et2_grid tbody tr .row td .et2_box_widget input {
margin: 0 5px 0 0;
}
body .dialogHeadbar button[class*=“et2_button_with_image”]:not([class*=“et2_toolbar_hasCaption”]) {
-webkit-filter: brightness(0) invert(1) !important;
filter: brightness(0) invert(1) !important;

Modified: trunk/pixelegg/mobile/fw_mobile.less
URL: http://svn.stylite.de/viewvc/egroupware/trunk/pixelegg/mobile/fw_mobile.less?rev=55633&r1=55632&r2=55633&view=diff

— trunk/pixelegg/mobile/fw_mobile.less (original)
+++ trunk/pixelegg/mobile/fw_mobile.less Tue Apr 5 18:33:17 2016
@@ -950,6 +950,8 @@
}

		.et2_taglist>div{min-height: auto;}

  	form.et2_container div table.et2_grid tbody tr .row td .et2_box_widget input {margin:0 5px 0 0;}
  }
  .dialogHeadbar {
  	button[class*="et2_button_with_image"]:not([class*="et2_toolbar_hasCaption"]) {

Added: trunk/projectmanager/templates/mobile/app.css
URL: http://svn.stylite.de/viewvc/egroupware/trunk/projectmanager/templates/mobile/app.css?rev=55633&view=auto

— trunk/projectmanager/templates/mobile/app.css (added)
+++ trunk/projectmanager/templates/mobile/app.css Tue Apr 5 18:33:17 2016
@@ -1,0 +1,25 @@
+/**

- PROJECTMANAGER - 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 projectmanager
- @version $Id: app.less 55033 2016-02-16 18:49:17Z hnategh $
/
+/ tablets and smartphones */
+@media all {
.dialogHeadbar .et2_label {
white-space: nowrap;
}
.projectElement {
margin-top: 5px;
padding-left: 0px !important;
}
.noLeftPadding .et2_label {
padding-left: 0px !important;
}
+}

Added: trunk/projectmanager/templates/mobile/app.less
URL: http://svn.stylite.de/viewvc/egroupware/trunk/projectmanager/templates/mobile/app.less?rev=55633&view=auto

— trunk/projectmanager/templates/mobile/app.less (added)
+++ trunk/projectmanager/templates/mobile/app.less Tue Apr 5 18:33:17 2016
@@ -1,0 +1,29 @@
+/**

- PROJECTMANAGER - 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 projectmanager
- @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 {

.dialogHeadbar {
```
  .et2_label{white-space: nowrap;}
```
}
.projectElement {
```
  margin-top:5px;
```
```
  padding-left:0px !important;
```
}
.noLeftPadding {

  .et2_label {padding-left:0px !important;}

}
+}

Added: trunk/projectmanager/templates/mobile/edit.xet
URL: http://svn.stylite.de/viewvc/egroupware/trunk/projectmanager/templates/mobile/edit.xet?rev=55633&view=auto

— trunk/projectmanager/templates/mobile/edit.xet (added)
+++ trunk/projectmanager/templates/mobile/edit.xet Tue Apr 5 18:33:17 2016
@@ -1,0 +1,284 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+

```
  <grid width="100%">
```
```
  	<columns>
```
```
  		<column width="120"/>
```
```
  		<column/>
```
```
  	</columns>
```
```
  	<rows>
```
```
  		<row>
```

  			<description value="Category" for="cat_id"/>

```
  			<menulist class="et2_fullWidth">
```

  				<menupopup type="select-cat" id="cat_id" options="None"/>

```
  			</menulist>
```
```
  		</row>
```
```
  		<row>
```

  			<description value="Access" for="pm_access"/>

```
  			<menulist class="et2_fullWidth">
```

  				<menupopup id="pm_access" no_lang="1"/>

```
  			</menulist>
```
```
  		</row>
```
```
  		<row>
```

  			<description value="Priority" for="pm_priority"/>

```
  			<menulist class="et2_fullWidth">
```

  				<menupopup type="select-number" id="pm_priority" options=",1,10"/>

```
  			</menulist>
```
```
  		</row>
```
```
  		<row>
```

  			<description value="Status" for="pm_status"/>

```
  			<vbox>
```
```
  				<menulist>
```

  					<menupopup id="pm_status" no_lang="1"/>

```
  				</menulist>
```

  				<checkbox statustext="If checked the datasources of the elements (eg. InfoLog entries) will change their status too." label="datasources too" id="status_sources" class="projectmanager_leftPad5"/>

```
  			</vbox>
```
```
  		</row>
```
```
  		<row>
```

  			<description value="Startdate" for="pm_real_start"/>

```
  			<vbox>
```
```
  				<date-time id="pm_real_start"/>
```

  				<date-time label="(%s)" id="ds[pe_real_start]" readonly="true" class="projectElement"/>

```
  			</vbox>
```
```
  		</row>
```
```
  		<row>
```

  			<description value="- planned" for="pm_planned_end"/>

```
  			<vbox>
```

  				<date-time id="pm_planned_start"/>

  				<date-time label="(%s)" id="ds[pe_planned_start]" readonly="true" class="projectElement"/>

```
  			</vbox>
```
```
  		</row>
```
```
  		<row>
```

  			<description value="Enddate" for="pm_real_end"/>

```
  			<vbox>
```
```
  				<date-time id="pm_real_end" />
```

  				<date-time label="(%s)" id="ds[pe_real_end]" readonly="true" class="projectElement"/>

```
  			</vbox>
```
```
  		</row>
```
```
  		<row>
```

  			<description value="- planned" for="pm_planned_end"/>

```
  			<vbox>
```

  				<date-time id="pm_planned_end" />

  				<date-time label="(%s)" id="ds[pe_planned_end]" readonly="true" class="projectElement"/>

```
  			</vbox>
```
```
  		</row>
```

  		<row  disabled="@pm_accounting_type=status">

  			<description value="Times" for="pm_used_time"/>

```
  			<vbox class="noLeftPadding">
```

  				<date-duration id="pm_used_time" options="@duration_format" />

  				<date-duration label="(%s)" id="ds[pe_used_time]" readonly="true" options="@duration_format" class="projectElement"/>

```
  			</vbox>
```
```
  		</row>
```

  		<row disabled="@pm_accounting_type=status">

  			<description value="- planned" for="pm_planned_time"/>

```
  			<vbox class="noLeftPadding">
```

  				<date-duration id="pm_planned_time" options="@duration_format"/>

  				<date-duration label="(%s)" id="ds[pe_planned_time]" readonly="true" options="@duration_format" class="projectElement"/>

```
  			</vbox>
```
```
  		</row>
```
```
  		<row >
```

  			<description value="Status" for="pm_completion"/>

```
  			<vbox class="noLeftPadding">
```
```
  				<menulist>
```

  					<menupopup type="select-percent" id="pm_completion" options="None"/>

```
  				</menulist>
```

  				<description label="(%s)" id="ds[pe_completion]" no_lang="1" readonly="true" class="projectElement"/>

```
  			</vbox>
```
```
  		</row>
```
```
  	</rows>
```
```
  </grid>
```
```
  <grid width="100%">
```
```
  	<columns>
```
```
  		<column/>
```
```
  	</columns>
```
```
  	<rows>
```
```
  		<row valign="top">
```

  			<htmlarea id="pm_description" mode="extended" height="240px" width="100%" toolbar="true" imageUpload="link_to"/>

```
  		</row>
```
```
  	</rows>
```
```
  </grid>
```
```
  <grid width="100%">
```
```
  	<columns>
```
```
  		<column width="120"/>
```
```
  		<column/>
```
```
  		<column width="30"/>
```
```
  	</columns>
```
```
  	<rows>
```
```
  		<row class="th">
```
```
  			<description value="Members"/>
```
```
  			<description value="Role"/>
```
```
  			<description/>
```
```
  		</row>
```

  		<row class="row" height="12" disabled="@view" valign="top">

```
  			<menulist class="et2_fullWidth">
```

  				<menupopup type="select-account" id="member[1]" options="select one,both"/>

```
  			</menulist>
```
```
  			<menulist class="et2_fullWidth">
```
```
  				<menupopup id="role[1]" />
```
```
  			</menulist>
```

  			<button id="add" image="add" background_image="1"/>

```
  		</row>
```

  		<row class="row" valign="top" disabled="!@member">

```
  			<menulist>
```

  				<menupopup type="select-account" id="member[$row]" readonly="true"/>

```
  			</menulist>
```
```
  			<menulist class="et2_fullWidth">
```

  				<menupopup id="role[$row]" options="None"/>

```
  			</menulist>
```
```
  			<description/>
```
```
  		</row>
```
```
  	</rows>
```
```
  </grid>
```
```
  <grid width="100%">
```
```
  	<columns>
```
```
  		<column width="120"/>
```
```
  		<column/>
```
```
  	</columns>
```
```
  	<rows>
```
```
  		<row>
```

  			<description value="Accounting type" for="pm_accounting_type"/>

```
  			<menulist class="et2_fullWidth">
```

  				<menupopup id="pm_accounting_type" onchange="1"/>

```
  			</menulist>
```
```
  		</row>
```
```
  		<row disabled="@no_budget">
```

  			<description value="Budget" for="pm_used_budget"/>

```
  			<vbox>
```

  				<textbox type="float" id="pm_used_budget" class="et2_fullWidht"/>

  				<textbox type="float" id="ds[pe_used_budget]" readonly="true" min="2" class="projectElement"/>

```
  			</vbox>
```
```
  		</row>
```
```
  		<row disabled="@no_budget">
```

  			<description value="- planned" for="pm_planned_budget"/>

```
  			<vbox>
```

  				<textbox type="float" id="pm_planned_budget" class="et2_fullWidht"/>

  				<textbox type="float" id="ds[pe_planned_budget]" readonly="true" min="2" class="projectElement"/>

```
  			</vbox>
```
```
  		</row>
```
```
  	</rows>
```
```
  </grid>
```
```
  <grid width="100%">
```
```
  	<columns>
```
```
  		<column width = "120"/>
```
```
  		<column/>
```
```
  	</columns>
```
```
  	<rows>
```
```
  		<row>
```

  			<box width="100%" overflow="auto">

```
  				<customfields/>
```
```
  			</box>
```
```
  		</row>
```
```
  	</rows>
```
```
  </grid>
```
```
  <grid width="100%">
```
```
  	<columns>
```
```
  		<column width="600"/>
```
```
  	</columns>
```
```
  	<rows>
```
```
  		<row disabled="@view">
```
```
  			<link-to id="link_to"/>
```
```
  		</row>
```
```
  		<row class="th">
```

  			<description value="Existing links"/>

```
  		</row>
```
```
  		<row>
```
```
  			<link-list id="link_to"/>
```
```
  		</row>
```
```
  	</rows>
```
```
  </grid>
```
```
  <grid width="100%">
```
```
  	<columns>
```
```
  		<column width = "120"/>
```
```
  		<column/>
```
```
  	</columns>
```
```
  	<rows>
```
```
  		<row disabled="!@pm_id">
```
```
  			<description value="Modified"/>
```
```
  			<description/>
```
```
  		</row>
```
```
  		<row>
```

  			<time_or_date id="pm_modified" readonly="true"/>

```
  			<menulist>
```

  				<menupopup type="select-account" label="by" id="pm_modifier" readonly="true"/>

```
  			</menulist>
```
```
  		</row>
```
```
  		<row disabled="!@pm_id">
```
```
  			<description value="created"/>
```
```
  			<description/>
```
```
  		</row>
```
```
  		<row>
```

  			<time_or_date id="pm_created" no_lang="1" readonly="true"/>

```
  			<menulist>
```

  				<menupopup type="select-account" label="by" id="pm_creator" readonly="true"/>

```
  			</menulist>
```
```
  		</row>
```
```
  	</rows>
```
```
  </grid>
```
```
  <grid width="100%">
```
```
  	<columns>
```
```
  		<column width="120"/>
```
```
  		<column/>
```
```
  	</columns>
```
```
  	<rows>
```

  		<row disabled="@hidebuttons" class="dialogHeadbar" >

```
  			<hbox  span="all" width="100%">
```

  				<button statustext="Apply the changes" id="button[apply]" image="apply" background_image="1"/>

  				<button statustext="Delete this project" id="delete" onclick="et2_dialog.confirm(widget,'Delete this project','Delete')" image="delete" background_image="1"/>

  				<checkbox statustext="If checked the datasources of the elements (eg. InfoLog entries) are deleted too." label="datasources too" id="delete_sources"/>

```
  			</hbox>
```
```
  		</row>
```

  		<row disabled="!@showsearchbuttons" class="dialogHeadbar">

```
  			<hbox span="all" width="100%">
```

  				<button label="Search" id="button[search]" image="search" background_image="1"/>

  				<button label="Cancel" id="button[cancelsearch]" image="cancel" background_image="1"/>

```
  			</hbox>
```
```
  		</row>
```
```
  		<row>
```

  			<description value="Project ID" for="pm_number"/>

  			<textbox statustext="leave it empty to have one generated" id="pm_number" no_lang="1" maxlength="64" class="et2_fullWidth"/>

```
  		</row>
```
```
  		<row>
```

  			<textbox blur="Title" id="pm_title" needed="1" maxlength="255" tabindex="1" class="et2_fullWidth" span="all"/>

```
  		</row>
```
```
  		<row>
```

  			<tabbox id="tabs" span="all" width="100%" align_tabs="v">

```
  				<tabs>
```

  					<tab id="general" label="General" statustext="Start, End, Category, ..."/>

  					<tab id="description" label="Description" statustext="free descriptiv text"/>

  					<tab id="members" label="Members" statustext="Project members and roles"/>

  					<tab id="accounting" label="Accounting" statustext="Accounting options"/>

  					<tab id="custom" label="Custom" statustext="Custom fields"/>

  					<tab id="links" label="Links" statustext="Linked elements"/>

  					<tab id="ownership" label="Ownership" statustext="Ownership"/>

```
  				</tabs>
```
```
  				<tabpanels>
```

  					<template id="projectmanager.edit.general"/>

  					<template id="projectmanager.edit.description"/>

  					<template id="projectmanager.edit.members"/>

  					<template id="projectmanager.edit.accounting"/>

  					<template id="projectmanager.edit.custom"/>

  					<template id="projectmanager.edit.links"/>

  					<template id="projectmanager.edit.ownership"/>

```
  				</tabpanels>
```
```
  			</tabbox>
```
```
  		</row>
```
```
  	</rows>
```
```
  </grid>
```

Modified: trunk/projectmanager/templates/mobile/list.xet
URL: http://svn.stylite.de/viewvc/egroupware/trunk/projectmanager/templates/mobile/list.xet?rev=55633&r1=55632&r2=55633&view=diff

— trunk/projectmanager/templates/mobile/list.xet (original)
+++ trunk/projectmanager/templates/mobile/list.xet Tue Apr 5 18:33:17 2016
@@ -9,19 +9,14 @@

  		<column width="90%"/>
  		<column width="100"/>

  		<column width="90%"/>
  	</columns>
  	<rows>
  		<row class="th">
  		</row>
  		<row class="$row_cont[class]">
  			<description class=" cat_$row_cont[cat_id] mobile_cat_col"/>

```
  			<vbox class="pmCol1">
```

  				<date-duration label="time" id="${row}[pm_used_time]" readonly="true" options="@@duration_format"/>

  				<date-duration label="planned" id="${row}[pm_planned_time]" readonly="true" options="@@duration_format" span="all" class="planned"/>

  				<progress align="center" label="$row_cont[pm_completion]" id="${row}[pm_completion]" no_lang="1"/>

  			</vbox>
  			<vbox class="pmCol2">
  				<hbox>
  					<description id="${row}[pm_number]" no_lang="1"/>

@@ -30,18 +25,22 @@

  				<description id="${row}[pm_title]" no_lang="1" />
  				<hbox>
  					<label value="Start" class="startPlanned"/>
  					<date id="${row}[pm_planned_start]" readonly="true" class="planned"/>
  					<hbox class="endPlanned">
  						<label value="End" />

  						<date id="${row}[pm_planned_end]" readonly="true" class="planned"/>

  						<date id="${row}[pm_planned_end]" readonly="true" class="planned"/>
  					</hbox>
  				</hbox>
  			</vbox>

```
  			<vbox class="pmCol1">
```

  				<date-duration label="time" id="${row}[pm_used_time]" readonly="true" options="@@duration_format"/>

  				<date-duration label="planned" id="${row}[pm_planned_time]" readonly="true" options="@@duration_format" span="all" class="planned"/>

  				<progress align="center" label="$row_cont[pm_completion]" id="${row}[pm_completion]" no_lang="1"/>

  			</vbox>
  		</row>
  	</rows>
  </grid>

@@ -60,7 +59,7 @@

  			<description id="plus_button_container"/>

  			<description id="plus_button_container"/>
  		</row>
  		<row>
  			<nextmatch id="nm" template="projectmanager.list.rows"/>

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs