[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17394] more on controller, mobilefrontend
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17394] more on controller, mobilefrontend |
|
Date: |
Mon, 4 Dec 2017 10:22:53 -0500 (EST) |
Revision: 17394
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17394
Author: sigurdne
Date: 2017-12-04 10:22:53 -0500 (Mon, 04 Dec 2017)
Log Message:
-----------
more on controller, mobilefrontend
Modified Paths:
--------------
trunk/controller/js/controller/ajax.js
trunk/controller/templates/mobilefrontend/case/case_row.xsl
trunk/controller/templates/mobilefrontend/case/create_case_message.xsl
trunk/controller/templates/mobilefrontend/case/view_case_message.xsl
trunk/controller/templates/mobilefrontend/check_list/fragments/nav_control_plan.xsl
trunk/controller/templates/mobilefrontend/css/base.css
Modified: trunk/controller/js/controller/ajax.js
===================================================================
--- trunk/controller/js/controller/ajax.js 2017-12-04 09:30:02 UTC (rev
17393)
+++ trunk/controller/js/controller/ajax.js 2017-12-04 15:22:53 UTC (rev
17394)
@@ -665,7 +665,9 @@
{
if
(!$(thisForm).find("ul.cases").prev().hasClass("input_error_msg"))
+ {
$(thisForm).find("ul.cases").before("<div
class='input_error_msg'>Vennligst velg en sak som meldingen omfatter</div>");
+ }
status = false;
}
Modified: trunk/controller/templates/mobilefrontend/case/case_row.xsl
===================================================================
--- trunk/controller/templates/mobilefrontend/case/case_row.xsl 2017-12-04
09:30:02 UTC (rev 17393)
+++ trunk/controller/templates/mobilefrontend/case/case_row.xsl 2017-12-04
15:22:53 UTC (rev 17394)
@@ -7,7 +7,7 @@
<xsl:text>&</xsl:text>
<xsl:value-of select="php:function('get_phpgw_session_url')" />
</xsl:variable>
- <fieldset>
+ <li class="check_item_case">
<xsl:choose>
<xsl:when test="cases_array/child::node()">
<h4>
@@ -240,5 +240,5 @@
</ul>
</xsl:when>
</xsl:choose>
- </fieldset>
+ </li>
</xsl:template>
Modified: trunk/controller/templates/mobilefrontend/case/create_case_message.xsl
===================================================================
--- trunk/controller/templates/mobilefrontend/case/create_case_message.xsl
2017-12-04 09:30:02 UTC (rev 17393)
+++ trunk/controller/templates/mobilefrontend/case/create_case_message.xsl
2017-12-04 15:22:53 UTC (rev 17394)
@@ -46,6 +46,8 @@
<xsl:text>&get_locations=</xsl:text>
<xsl:value-of select="get_locations"/>
</xsl:attribute>
+ <i
class="fa fa-calendar" aria-hidden="true"></i>
+
<xsl:text> </xsl:text>
Kontrollplan for komponent (år)
</a>
</li>
@@ -60,6 +62,8 @@
<xsl:text>&location_code=</xsl:text>
<xsl:value-of select="location_array/location_code"/>
</xsl:attribute>
+ <i
class="fa fa-calendar" aria-hidden="true"></i>
+
<xsl:text> </xsl:text>
Kontrollplan for bygg/eiendom (år)
</a>
</li>
@@ -75,6 +79,8 @@
<xsl:text>&location_code=</xsl:text>
<xsl:value-of select="location_array/location_code"/>
</xsl:attribute>
+ <i
class="fa fa-calendar" aria-hidden="true"></i>
+
<xsl:text> </xsl:text>
Kontrolplan for bygg/eiendom (måned)
</a>
</li>
@@ -97,7 +103,7 @@
<xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:controller.uicase.send_case_message')" />
</xsl:variable>
- <form ENCTYPE="multipart/form-data"
id="frmRegCaseMessage" action="{$action_url}" method="post">
+ <form ENCTYPE="multipart/form-data"
id="frmRegCaseMessage" action="{$action_url}" method="post" class="pure-form
pure-form-stacked">
<input>
<xsl:attribute
name="name">check_list_id</xsl:attribute>
<xsl:attribute
name="type">hidden</xsl:attribute>
@@ -121,16 +127,14 @@
</input>
<!-- === TITLE === -->
- <div class="row">
- <label>Tittel på
melding:</label>
- <input
name="message_title" type="text" class="required" />
- </div>
+
+ <label>Tittel på
melding:</label>
+ <input name="message_title"
type="text" class="pure-input-1 required" required="required"/>
<!-- === CATEGORY === -->
- <div class="row">
<label>Kategori:</label>
- <select
name="message_cat_id" class="required">
- <option
value="0">Velg kategori</option>
+ <select
name="message_cat_id" class="required" required="required">
+ <option
value="">Velg kategori</option>
<xsl:for-each
select="categories/cat_list">
<xsl:variable name="cat_id">
<xsl:value-of select="./cat_id"/>
@@ -140,15 +144,12 @@
</option>
</xsl:for-each>
</select>
- </div>
<!-- === UPLOAD FILE === -->
- <div class="row">
<label>Filvedlegg:</label>
<input type="file"
id="file" name="file" >
<xsl:attribute
name="accept">image/*</xsl:attribute>
<xsl:attribute
name="capture">camera</xsl:attribute>
</input>
- </div>
<h3>Velg hvilke saker meldingen
gjelder</h3>
<ul class="cases">
@@ -202,7 +203,7 @@
<xsl:variable
name="lang_save">
<xsl:value-of
select="php:function('lang', 'save')" />
</xsl:variable>
- <input class="btn"
type="submit" name="save_control" value="Send melding" title="{$lang_save}" />
+ <input
class="pure-button pure-button-primary" type="submit" name="save_control"
value="Send melding" title="{$lang_save}" />
</div>
</form>
</xsl:when>
Modified: trunk/controller/templates/mobilefrontend/case/view_case_message.xsl
===================================================================
--- trunk/controller/templates/mobilefrontend/case/view_case_message.xsl
2017-12-04 09:30:02 UTC (rev 17393)
+++ trunk/controller/templates/mobilefrontend/case/view_case_message.xsl
2017-12-04 15:22:53 UTC (rev 17394)
@@ -44,6 +44,8 @@
<xsl:text>&get_locations=</xsl:text>
<xsl:value-of select="get_locations"/>
</xsl:attribute>
+ <i
class="fa fa-calendar" aria-hidden="true"></i>
+
<xsl:text> </xsl:text>
Kontrollplan for komponent (år)
</a>
</li>
@@ -58,6 +60,8 @@
<xsl:text>&location_code=</xsl:text>
<xsl:value-of select="location_array/location_code"/>
</xsl:attribute>
+ <i
class="fa fa-calendar" aria-hidden="true"></i>
+
<xsl:text> </xsl:text>
Kontrollplan for bygg/eiendom (år)
</a>
</li>
@@ -73,6 +77,8 @@
<xsl:text>&location_code=</xsl:text>
<xsl:value-of select="location_array/location_code"/>
</xsl:attribute>
+ <i
class="fa fa-calendar" aria-hidden="true"></i>
+
<xsl:text> </xsl:text>
Kontrolplan for bygg/eiendom (måned)
</a>
</li>
@@ -156,7 +162,7 @@
<xsl:variable name="new_ticket_url">
<xsl:value-of
select="php:function('get_phpgw_link', '/index.php', $new_ticket_params)" />
</xsl:variable>
- <a class="btn" href="{$new_ticket_url}">
+ <a class="pure-button pure-button-primary"
href="{$new_ticket_url}">
<xsl:value-of select="php:function('lang',
'Register new message')" />
</a>
</div>
Modified:
trunk/controller/templates/mobilefrontend/check_list/fragments/nav_control_plan.xsl
===================================================================
---
trunk/controller/templates/mobilefrontend/check_list/fragments/nav_control_plan.xsl
2017-12-04 09:30:02 UTC (rev 17393)
+++
trunk/controller/templates/mobilefrontend/check_list/fragments/nav_control_plan.xsl
2017-12-04 15:22:53 UTC (rev 17394)
@@ -21,6 +21,7 @@
<xsl:value-of
select="get_locations"/>
</xsl:attribute>
<i class="fa fa-calendar"
aria-hidden="true"></i>
+ <xsl:text> </xsl:text>
Kontrollplan for komponent (år)
</a>
</li>
@@ -51,6 +52,7 @@
<xsl:value-of
select="location_array/location_code"/>
</xsl:attribute>
<i class="fa fa-calendar"
aria-hidden="true"></i>
+ <xsl:text> </xsl:text>
Kontrolplan for bygg/eiendom (måned)
</a>
</li>
Modified: trunk/controller/templates/mobilefrontend/css/base.css
===================================================================
--- trunk/controller/templates/mobilefrontend/css/base.css 2017-12-04
09:30:02 UTC (rev 17393)
+++ trunk/controller/templates/mobilefrontend/css/base.css 2017-12-04
15:22:53 UTC (rev 17394)
@@ -47,6 +47,11 @@
list-style-type: none;
}
+ul.cases li{
+ list-style-type: none;
+}
+
+
ul.expand_list {
list-style-type: none;
}
@@ -119,3 +124,80 @@
td:last-of-type, th:last-of-type {
border-right: none;
}
+
+/* ===================================== VIEW CASES
================================ */
+
+li.check_item_case{
+ list-style-type: none;
+}
+li.check_item_case h4 {
+ margin: 5px 0;
+}
+
+li.check_item_case ul{
+ margin-bottom: 20px;
+}
+
+li.check_item_case ul li {
+ background: none repeat scroll 0 0 #E7EFF8;
+ border: 1px solid #DDDDDD;
+ clear: both;
+ margin: 10px 0 0 20px;
+ overflow: hidden;
+}
+
+li.check_item_case ul li.quick_edit_case {
+ padding: 0;
+}
+
+li.check_item_case .quick_edit_case h4 {
+ color: #000000;
+ margin: 0;
+ padding: 2px 10px;
+}
+
+li.check_item_case ul li .col_1 {
+ font-size: 13px;
+ font-weight: bold;
+ text-align: center;
+ float: left;
+ padding: 2em 0;
+ width: 5%;
+}
+
+li.check_item_case ul li .col_2 {
+ border-left: 1px solid #DDDDDD;
+ border-right: 1px solid #DDDDDD;
+ float: left;
+ padding: 1em 2%;
+ width: 76%;
+}
+
+li.check_item_case ul li .col_3 {
+ float: left;
+ padding: 30px 0;
+ text-align: center;
+ width: 14.7333%;
+}
+
+#main_content .quick_edit_case fieldset {
+ padding: 5px;
+}
+.input_error_msg {
+ background: none repeat scroll 0 0 #FBE3E4;
+ border-bottom-right-radius: 4px;
+ color: #D12F19;
+ display: inline-block;
+ margin-bottom: 5px;
+ margin-top: 5px;
+ padding: 5px;
+ text-align: center;
+ width: 90%;
+}
+
+#caseMessage a#showMessage {
+ float: right;
+ font-size: 17px;
+ font-weight: bold;
+ text-decoration: none;
+}
\ No newline at end of file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17394] more on controller, mobilefrontend,
sigurdne <=