[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8023]
From: |
Torstein |
Subject: |
[Fmsystem-commits] [8023] |
Date: |
Fri, 04 Nov 2011 16:36:26 +0000 |
Revision: 8023
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8023
Author: vator
Date: 2011-11-04 16:36:25 +0000 (Fri, 04 Nov 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.uicontrol.inc.php
trunk/controller/templates/base/view_check_list.xsl
Added Paths:
-----------
trunk/controller/images/status_icon_blue.png
trunk/controller/images/status_icon_blue.psd
trunk/controller/images/status_icon_dark_green.png
trunk/controller/images/status_icon_light_green.png
trunk/controller/images/status_icon_light_green.psd
trunk/controller/images/status_icon_red.png
trunk/controller/images/status_icon_red.psd
trunk/controller/images/status_icon_yellow.png
trunk/controller/templates/base/choose_control_items.xsl
Added: trunk/controller/images/status_icon_blue.png
===================================================================
(Binary files differ)
Property changes on: trunk/controller/images/status_icon_blue.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/controller/images/status_icon_blue.psd
===================================================================
(Binary files differ)
Property changes on: trunk/controller/images/status_icon_blue.psd
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/controller/images/status_icon_dark_green.png
===================================================================
(Binary files differ)
Property changes on: trunk/controller/images/status_icon_dark_green.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/controller/images/status_icon_light_green.png
===================================================================
(Binary files differ)
Property changes on: trunk/controller/images/status_icon_light_green.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/controller/images/status_icon_light_green.psd
===================================================================
(Binary files differ)
Property changes on: trunk/controller/images/status_icon_light_green.psd
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/controller/images/status_icon_red.png
===================================================================
(Binary files differ)
Property changes on: trunk/controller/images/status_icon_red.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/controller/images/status_icon_red.psd
===================================================================
(Binary files differ)
Property changes on: trunk/controller/images/status_icon_red.psd
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/controller/images/status_icon_yellow.png
===================================================================
(Binary files differ)
Property changes on: trunk/controller/images/status_icon_yellow.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/controller/inc/class.uicontrol.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol.inc.php 2011-11-04 14:59:48 UTC
(rev 8022)
+++ trunk/controller/inc/class.uicontrol.inc.php 2011-11-04 16:36:25 UTC
(rev 8023)
@@ -305,7 +305,7 @@
self::add_javascript('controller', 'yahoo',
'control_tabs.js');
self::add_javascript('controller', 'controller',
'jquery.js');
self::add_javascript('controller', 'controller',
'custom_ui.js');
- self::render_template_xsl(array('control_tabs',
'control_items'), $data);
+ self::render_template_xsl(array('control_tabs',
'choose_control_items'), $data);
}
// Saves chosen control items through receiving a comma
separated list of control tags (1:2, control_group_id:control_item_id)
Copied: trunk/controller/templates/base/choose_control_items.xsl (from rev
8010, trunk/controller/templates/base/control_items.xsl)
===================================================================
--- trunk/controller/templates/base/choose_control_items.xsl
(rev 0)
+++ trunk/controller/templates/base/choose_control_items.xsl 2011-11-04
16:36:25 UTC (rev 8023)
@@ -0,0 +1,43 @@
+<xsl:template name="control_items" xmlns:php="http://php.net/xsl">
+
+<div class="yui-content tab_content">
+ <div>
+
+ <!-- =========================== CHOOSE CONTROL ITEMS
=============================== -->
+ <h2>Velg dine kontrollpunkt</h2>
+
+ <h4 class="expand_header"><div class="expand_all">Vis
alle</div><div class="collapse_all">Skjul alle</div></h4>
+ <form id="frm_control_items"
action="index.php?menuaction=controller.uicontrol.save_control_items"
method="post">
+ <xsl:variable name="control_id"><xsl:value-of
select="control_id"/></xsl:variable>
+ <input type="hidden" name="control_id"
value="{control_id}" />
+
+ <xsl:variable name="control_group_ids"><xsl:value-of
select="control_group_ids"/></xsl:variable>
+ <input type="hidden" name="control_group_ids"
value="{control_group_ids}" />
+
+ <ul class="control_items">
+ <xsl:for-each
select="groups_with_control_items">
+ <ul class="itemlist expand_list">
+ <li>
+ <h4><img
src="controller/images/arrow_left.png" width="14"/><span><xsl:value-of
select="control_group/group_name"/></span></h4>
+ <xsl:variable
name="control_group_id"><xsl:value-of select="control_group/id"/></xsl:variable>
+ <ul>
+ <xsl:for-each
select="group_control_items">
+ <xsl:variable
name="control_item_id"><xsl:value-of select="id"/></xsl:variable>
+
+ <li><xsl:number/>.
<input type="checkbox" id="ch_{$control_group_id}:{$control_item_id}"
value="{$control_group_id}:{$control_item_id}" /><xsl:value-of
select="title"/></li>
+ </xsl:for-each>
+ </ul>
+ </li>
+ </ul>
+ </xsl:for-each>
+ </ul>
+
+ <div>
+ <xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'save')" /></xsl:variable>
+ <input type="submit" name="save_control_items"
value="{$lang_save}" title = "{$lang_save}" />
+ </div>
+ </form>
+
+ </div>
+</div>
+</xsl:template>
\ No newline at end of file
Property changes on: trunk/controller/templates/base/choose_control_items.xsl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/controller/templates/base/view_check_list.xsl
===================================================================
--- trunk/controller/templates/base/view_check_list.xsl 2011-11-04 14:59:48 UTC
(rev 8022)
+++ trunk/controller/templates/base/view_check_list.xsl 2011-11-04 16:36:25 UTC
(rev 8023)
@@ -6,8 +6,8 @@
<xsl:variable name="control_id"><xsl:value-of
select="control_id"/></xsl:variable>
<input type="hidden" id="control_id" name="control_id"
value="{control_id}" />
- <h3>Detaljer for kontroll</h3>
- <fieldset>
+ <h1>Detaljer for kontroll</h1>
+ <fieldset class="control_details">
<label>Tittel</label><xsl:value-of
select="control_as_array/title"/><br/>
<label>Startdato</label><xsl:value-of
select="control_as_array/start_date"/><br/>
<label>Sluttdato</label><xsl:value-of
select="control_as_array/end_date"/><br/>
@@ -15,7 +15,7 @@
<label>Syklusfrekvens</label><xsl:value-of
select="control_as_array/repeat_interval"/><br/>
</fieldset>
- <h3>Sjekklister</h3>
+ <h2>Sjekklister</h2>
<ul class="check_list">
<li class="heading">
<div>Kommentar</div>
@@ -28,7 +28,8 @@
<xsl:when test="check_list_array/child::node()">
<xsl:for-each select="check_list_array">
<li>
- <div
class="order_nr"><xsl:number/></div>.
+ <div class="icon"><img
height="15" src="controller/images/status_icon_light_green.png" /></div>
+ <div
class="order_nr"><xsl:number/>.</div>
<div><xsl:value-of
select="comment"/></div>
<div><xsl:value-of
select="status"/></div>
<div><xsl:value-of
select="deadline"/></div>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8023],
Torstein <=