|
| From: | Torstein |
| Subject: | [Fmsystem-commits] [9144] |
| Date: | Fri, 13 Apr 2012 08:58:34 +0000 |
Revision: 9144
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9144
Author: vator
Date: 2012-04-13 08:58:34 +0000 (Fri, 13 Apr 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/templates/base/check_list/check_list_tab_menu.xsl
trunk/controller/templates/base/check_list/edit_check_list.xsl
trunk/controller/templates/base/check_list/view_open_cases.xsl
trunk/controller/templates/base/css/base.css
Modified: trunk/controller/templates/base/check_list/check_list_tab_menu.xsl
===================================================================
--- trunk/controller/templates/base/check_list/check_list_tab_menu.xsl
2012-04-13 08:41:03 UTC (rev 9143)
+++ trunk/controller/templates/base/check_list/check_list_tab_menu.xsl
2012-04-13 08:58:34 UTC (rev 9144)
@@ -4,41 +4,44 @@
<div id="check_list_menu">
<!-- ================== LOADS VIEW CHECKLIST DETAILS
===================== -->
- <a>
- <xsl:if test="$active_tab = 'view_details'">
- <xsl:attribute
name="class">active</xsl:attribute>
- </xsl:if>
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
- <xsl:text>&check_list_id=</xsl:text>
- <xsl:value-of select="check_list/id"/>
- </xsl:attribute>
- Vis detaljer for sjekkliste
- </a>
- <!-- ================== LOADS CASES FOR CHECKLIST
===================== -->
- <a>
- <xsl:if test="$active_tab = 'view_cases'">
- <xsl:attribute
name="class">active</xsl:attribute>
- </xsl:if>
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list.view_cases_for_check_list</xsl:text>
- <xsl:text>&check_list_id=</xsl:text>
- <xsl:value-of select="check_list/id"/>
- </xsl:attribute>
- Vis saker
- </a>
- <!-- ================== LOADS INFO ABOUT CONTROL
===================== -->
- <a>
- <xsl:if test="$active_tab = 'view_control_info'">
- <xsl:attribute
name="class">active</xsl:attribute>
- </xsl:if>
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list.view_control_info</xsl:text>
- <xsl:text>&check_list_id=</xsl:text>
- <xsl:value-of select="check_list/id"/>
- </xsl:attribute>
- Vis info om kontroll
- </a>
+ <div class="left_btns">
+ <a>
+ <xsl:if test="$active_tab = 'view_details'">
+ <xsl:attribute
name="class">active</xsl:attribute>
+ </xsl:if>
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
+ <xsl:text>&check_list_id=</xsl:text>
+ <xsl:value-of select="check_list/id"/>
+ </xsl:attribute>
+ Vis detaljer for sjekkliste
+ </a>
+ <!-- ================== LOADS CASES FOR CHECKLIST
===================== -->
+ <a>
+ <xsl:if test="$active_tab = 'view_cases'">
+ <xsl:attribute
name="class">active</xsl:attribute>
+ </xsl:if>
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.view_cases_for_check_list</xsl:text>
+ <xsl:text>&check_list_id=</xsl:text>
+ <xsl:value-of select="check_list/id"/>
+ </xsl:attribute>
+ Vis saker
+ </a>
+ <!-- ================== LOADS INFO ABOUT CONTROL
===================== -->
+ <a>
+ <xsl:if test="$active_tab =
'view_control_info'">
+ <xsl:attribute
name="class">active</xsl:attribute>
+ </xsl:if>
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.view_control_info</xsl:text>
+ <xsl:text>&check_list_id=</xsl:text>
+ <xsl:value-of select="check_list/id"/>
+ </xsl:attribute>
+ Vis info om kontroll
+ </a>
+ </div>
+
<div class="right_btns">
<!-- ================== REGISTER NEW CASE
===================== -->
<a class="btn focus first">
Modified: trunk/controller/templates/base/check_list/edit_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/edit_check_list.xsl
2012-04-13 08:41:03 UTC (rev 9143)
+++ trunk/controller/templates/base/check_list/edit_check_list.xsl
2012-04-13 08:58:34 UTC (rev 9144)
@@ -130,7 +130,7 @@
<div class="form-buttons">
<xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'save_check_list')" /></xsl:variable>
- <input style="width: 170px;" class="btn
not_active" type="submit" name="save_control" value="Lagre detaljer" />
+ <input class="btn not_active" type="submit"
name="save_control" value="Lagre detaljer" />
</div>
</form>
</div>
Modified: trunk/controller/templates/base/check_list/view_open_cases.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_open_cases.xsl
2012-04-13 08:41:03 UTC (rev 9143)
+++ trunk/controller/templates/base/check_list/view_open_cases.xsl
2012-04-13 08:58:34 UTC (rev 9144)
@@ -183,62 +183,66 @@
<xsl:for-each select="cases_array">
<xsl:variable name="cases_id"><xsl:value-of select="id"/></xsl:variable>
<li>
-
<div style="display: inline-block;padding: 2em 2%;vertical-align: top;">
+
+
<!-- ==================== COL1: ORDERNR ===================== -->
+
<div class="col_1">
<span class="order_nr"><xsl:number /></span>.
</div>
-
<div style="border-left: 1px solid #DDDDDD;border-right: 1px solid
#DDDDDD;display: inline-block;padding: 1em 2%;width: 73%;">
-
-
<form style="display:none;" class="frm_update_case">
-
<xsl:attribute name="action">
-
<xsl:text>index.php?menuaction=controller.uicase.save_case</xsl:text>
-
<xsl:text>&case_id=</xsl:text>
-
<xsl:value-of select="id"/>
-
<xsl:text>&check_list_id=</xsl:text>
-
<xsl:value-of select="//check_list/id"/>
-
<xsl:text>&phpgw_return_as=json</xsl:text>
-
</xsl:attribute>
-
-
<textarea name="case_descr"><xsl:value-of select="descr"/></textarea>
-
<div>
-
<input class='btn_m' type='submit' value='Oppdater' /><input
class='btn_m cancel' type='button' value='Avbryt' />
-
</div>
-
</form>
-
<div class="case_info">
-
<div class="case_descr"><xsl:value-of select="descr"/></div>
-
<div class="quick_menu">
-
<a class="quick_edit first" href="">
-
endre
-
</a>
-
<a class="close_case">
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicase.close_case</xsl:text>
-
<xsl:text>&case_id=</xsl:text>
-
<xsl:value-of select="id"/>
-
<xsl:text>&check_list_id=</xsl:text>
-
<xsl:value-of select="//check_list/id"/>
-
<xsl:text>&phpgw_return_as=json</xsl:text>
-
</xsl:attribute>
-
lukk
-
</a>
-
<xsl:choose>
-
<xsl:when test="location_item_id = 0">
-
<a class="delete_case">
+
<!-- ==================== COL2: CASE CONTENT ===================== -->
+
<div class="col_2">
+
<form style="display:none;" class="frm_update_case">
+
<xsl:attribute name="action">
+
<xsl:text>index.php?menuaction=controller.uicase.save_case</xsl:text>
+
<xsl:text>&case_id=</xsl:text>
+
<xsl:value-of select="id"/>
+
<xsl:text>&check_list_id=</xsl:text>
+
<xsl:value-of select="//check_list/id"/>
+
<xsl:text>&phpgw_return_as=json</xsl:text>
+
</xsl:attribute>
+
+
<textarea name="case_descr"><xsl:value-of
select="descr"/></textarea>
+
<div>
+
<input class='btn_m' type='submit' value='Oppdater'
/><input class='btn_m cancel' type='button' value='Avbryt' />
+
</div>
+
</form>
+
<div class="case_info">
+
<div class="case_descr"><xsl:value-of select="descr"/></div>
+
<div class="quick_menu">
+
<a class="quick_edit first" href="">
+
endre
+
</a>
+
<a class="close_case">
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicase.delete_case</xsl:text>
+
<xsl:text>index.php?menuaction=controller.uicase.close_case</xsl:text>
<xsl:text>&case_id=</xsl:text>
<xsl:value-of select="id"/>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of
select="//check_list/id"/>
<xsl:text>&phpgw_return_as=json</xsl:text>
</xsl:attribute>
-
slett
+
lukk
</a>
-
</xsl:when>
-
</xsl:choose>
+
<xsl:choose>
+
<xsl:when test="location_item_id = 0">
+
<a class="delete_case">
+
<xsl:attribute
name="href">
+
<xsl:text>index.php?menuaction=controller.uicase.delete_case</xsl:text>
+
<xsl:text>&case_id=</xsl:text>
+
<xsl:value-of
select="id"/>
+
<xsl:text>&check_list_id=</xsl:text>
+
<xsl:value-of
select="//check_list/id"/>
+
<xsl:text>&phpgw_return_as=json</xsl:text>
+
</xsl:attribute>
+
slett
+
</a>
+
</xsl:when>
+
</xsl:choose>
+
</div>
+
</div>
</div>
-
</div>
-
</div>
-
<div style="display: inline-block;padding: 3%;vertical-align: top;">
+
<!-- ==================== COL3: MESSAGE LINK
===================== -->
+
<div class="col_3">
+
<xsl:choose>
<xsl:when test="location_item_id > 0">
<a target="_blank">
Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css 2012-04-13 08:41:03 UTC
(rev 9143)
+++ trunk/controller/templates/base/css/base.css 2012-04-13 08:58:34 UTC
(rev 9144)
@@ -400,6 +400,16 @@
margin: 0 13px 0 0;
padding: 3px 6px;
}
+input[type="submit"] {
+ background: none repeat scroll 0 0 #4F9AEA;
+ border: 1px solid #428AD7;
+ border-radius: 4px 4px 4px 4px;
+ color: #FFFFFF;
+ cursor: pointer;
+ padding: 3px 20px;
+ border: 0;
+ margin-top: 20px;
+}
select{
padding: 3px 1px 3px 4px;
}
@@ -469,11 +479,6 @@
list-style-position: inside;
}
-
-.yui-content input[type="submit"] {
- margin: 15px 0 0;
- padding: 1px 15px;
-}
h1 img{
margin-right:5px;
}
@@ -839,9 +844,6 @@
margin-left: 15%;
width: 19%;
}
-#frm_update_check_list input[type="submit"]{
- width: 140px;
-}
/* ======================================= TAB CHECK LIST DETAILS
========================================= */
.tab_check_list_details label {
@@ -1233,8 +1235,10 @@
background: none repeat scroll 0 0 #CAE3FB;
border: 1px solid #CAE3FB;
}
-
-#check_list_menu div.right_btns {
+#check_list_menu .left_btns {
+ float: left;
+}
+#check_list_menu .right_btns {
float: right;
}
#check_list_menu .right_btns a {
@@ -1327,8 +1331,28 @@
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 .col_1 {
+ float: left;
+ padding: 2em 2%;
+ vertical-align: top;
+}
+li.check_item_case ul li .col_2 {
+ border-left: 1px solid #DDDDDD;
+ border-right: 1px solid #DDDDDD;
+ float: left;
+ padding: 1em 2%;
+ width: 73%;
+}
+li.check_item_case ul li .col_3 {
+ float: left;
+ padding: 3%;
+ vertical-align: top;
+}
+
li.check_item_case ul li.quick_edit {
padding: 0;
}
| [Prev in Thread] | Current Thread | [Next in Thread] |