[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10855] Moved view_closed_cases and view_open_cases t
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [10855] Moved view_closed_cases and view_open_cases to case folder |
|
Date: |
Fri, 15 Feb 2013 13:43:21 +0000 |
Revision: 10855
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10855
Author: vator
Date: 2013-02-15 13:43:18 +0000 (Fri, 15 Feb 2013)
Log Message:
-----------
Moved view_closed_cases and view_open_cases to case folder
Modified Paths:
--------------
trunk/controller/templates/base/case/add_case.xsl
trunk/controller/templates/base/css/base.css
trunk/controller/templates/mobilefrontend/case/add_case.xsl
trunk/controller/templates/mobilefrontend/css/base.css
Added Paths:
-----------
trunk/controller/templates/mobilefrontend/check_list/view_cases_for_check_list.xsl
Modified: trunk/controller/templates/base/case/add_case.xsl
===================================================================
--- trunk/controller/templates/base/case/add_case.xsl 2013-02-15 13:27:23 UTC
(rev 10854)
+++ trunk/controller/templates/base/case/add_case.xsl 2013-02-15 13:43:18 UTC
(rev 10855)
@@ -65,7 +65,7 @@
<div class="row what-to-do">
<label>Hva skal sjekkes:</label>
<div>
- <xsl:value-of select="what_to_do"/>
+ <xsl:value-of disable-output-escaping="yes"
select="what_to_do"/>
</div>
</div>
@@ -73,7 +73,7 @@
<div class="row how-to-do">
<label>Utførelsesbeskrivelse:</label>
<div>
- <xsl:value-of select="how_to_do"/>
+ <xsl:value-of disable-output-escaping="yes"
select="how_to_do"/>
</div>
</div>
Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css 2013-02-15 13:27:23 UTC
(rev 10854)
+++ trunk/controller/templates/base/css/base.css 2013-02-15 13:43:18 UTC
(rev 10855)
@@ -1653,6 +1653,14 @@
width: 185px;
}
+#check_list_menu a.first {
+ border-radius: 3px 3px 3px 3px:
+}
+
+#check_list_menu a.last {
+ border-radius: 3px 3px 3px 3px:
+}
+
#check_list_menu a.active {
background: none repeat scroll 0 0 #CAE3FB;
border: 1px solid #CAE3FB;
@@ -1860,9 +1868,9 @@
.frm_register_case textarea {
display: block;
height: 100px;
+ margin-bottom: 1em;
margin-top: 6px;
- margin-bottom: 1em;
- width: 63%;
+ width: 98.5%;
}
.frm_register_case label {
@@ -1879,7 +1887,7 @@
}
.add-cases .expand_list {
- padding-left: 15px;
+ padding-left: 15px;
}
.add-cases .expand_list li{
@@ -1889,11 +1897,15 @@
}
.add-cases .expand_list h4 {
- background: none repeat scroll 0 0 transparent;
- margin: 0;
- padding: 0;
+ background: none repeat scroll 0 0 transparent;
+ margin: 0;
+ padding: 0;
}
+.add-cases .expand_list h4 span{
+ padding-left: 0;
+}
+
.add-cases h3 img {
height: 15px;
margin-right: 5px;
Modified: trunk/controller/templates/mobilefrontend/case/add_case.xsl
===================================================================
--- trunk/controller/templates/mobilefrontend/case/add_case.xsl 2013-02-15
13:27:23 UTC (rev 10854)
+++ trunk/controller/templates/mobilefrontend/case/add_case.xsl 2013-02-15
13:43:18 UTC (rev 10855)
@@ -64,7 +64,7 @@
<div class="row what-to-do">
<label>Hva skal sjekkes:</label>
<div>
- <xsl:value-of select="what_to_do"/>
+ <xsl:value-of disable-output-escaping="yes"
select="what_to_do"/>
</div>
</div>
@@ -72,7 +72,7 @@
<div class="row how-to-do">
<label>Utførelsesbeskrivelse:</label>
<div>
- <xsl:value-of select="how_to_do"/>
+ <xsl:value-of disable-output-escaping="yes"
select="what_to_do"/>
</div>
</div>
Copied:
trunk/controller/templates/mobilefrontend/check_list/view_cases_for_check_list.xsl
(from rev 10851,
trunk/controller/templates/base/check_list/view_cases_for_check_list.xsl)
===================================================================
---
trunk/controller/templates/mobilefrontend/check_list/view_cases_for_check_list.xsl
(rev 0)
+++
trunk/controller/templates/mobilefrontend/check_list/view_cases_for_check_list.xsl
2013-02-15 13:43:18 UTC (rev 10855)
@@ -0,0 +1,104 @@
+<!-- $Id: edit_check_list.xsl 8513 2012-01-07 10:38:09Z vator $ -->
+<xsl:template match="data" name="view_check_list"
xmlns:php="http://php.net/xsl";>
+<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info', 'user|preferences|common|dateformat')"
/></xsl:variable>
+<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
+
+<div id="main_content" class="medium">
+ <script>
+
+ // ====================== LASTER FANEN view_open_errors NÅR
SIDEN LASTES FØRSTE GANG ===================
+ $(document).ready(function() {
+ var requestUrl = $("#view_open_cases").attr("href");
+ load_tab(requestUrl);
+ });
+
+ // ====================== FUNKSJONALITET FOR LASTING AV TABS
===================
+ $(function() {
+
+ $("#register_case").live("click", function(){
+ var requestUrl = $(this).attr("href");
+ load_tab(requestUrl);
+
+ return false;
+ });
+
+ $("#view_open_cases").live("click", function(){
+ var requestUrl = $(this).attr("href");
+ load_tab(requestUrl);
+
+ return false;
+ });
+
+ $("#view_closed_cases").live("click", function(){
+ var requestUrl = $(this).attr("href");
+ load_tab(requestUrl);
+
+ return false;
+ });
+
+ $("#view_measurements").live("click", function(){
+ var requestUrl = $(this).attr("href");
+ load_tab(requestUrl);
+
+ return false;
+ });
+ });
+
+ function load_tab(requestUrl){
+ $.ajax({
+ type: 'POST',
+ url: requestUrl,
+ success: function(data) {
+ $("#load_view_content").html(data);
+ },
+ error: function(XMLHttpRequest, textStatus,
errorThrown) {
+ if (XMLHttpRequest.status === 401) {
+ location.href = '/';
+ }
+ }
+ });
+ }
+ </script>
+
+ <div id="check-list-heading">
+ <div class="box-1">
+ <h1>Kontroll: <xsl:value-of
select="control/title"/></h1>
+ <xsl:choose>
+ <xsl:when test="type = 'component'">
+ <h2><xsl:value-of
select="component_array/xml_short_desc"/></h2>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:choose>
+ <xsl:when test="location_level
= 1">
+ <h2>Eiendom:
<xsl:value-of select="location_array/loc1_name"/></h2>
+ </xsl:when>
+ <xsl:otherwise>
+ <h2>Bygg:
<xsl:value-of select="location_array/loc2_name"/></h2>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:otherwise>
+ </xsl:choose>
+ </div>
+
+ <!-- ================== CHECKLIST TAB MENU
===================== -->
+ <xsl:call-template name="cases_menu">
+ <xsl:with-param
name="active_tab">view_cases</xsl:with-param>
+ </xsl:call-template>
+ </div>
+
+ <a id="view_open_cases">
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicase.view_open_cases</xsl:text>
+ <xsl:text>&check_list_id=</xsl:text>
+ <xsl:value-of select="check_list/id"/>
+
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
+ <xsl:value-of select="$session_url"/>
+ </xsl:attribute>
+ </a>
+
+ <div style="margin:20px 0;">
+ <xsl:call-template name="select_buildings_on_property"
/>
+ </div>
+ <div id="load_view_content"></div>
+</div>
+</xsl:template>
Modified: trunk/controller/templates/mobilefrontend/css/base.css
===================================================================
--- trunk/controller/templates/mobilefrontend/css/base.css 2013-02-15
13:27:23 UTC (rev 10854)
+++ trunk/controller/templates/mobilefrontend/css/base.css 2013-02-15
13:43:18 UTC (rev 10855)
@@ -1,4 +1,4 @@
#main_content.medium {
text-align: left;
- width: 100%;
+ width: 98%;
}
\ No newline at end of file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10855] Moved view_closed_cases and view_open_cases to case folder,
Torstein <=