[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9504]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [9504] |
|
Date: |
Tue, 05 Jun 2012 07:32:44 +0000 |
Revision: 9504
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9504
Author: vator
Date: 2012-06-05 07:32:43 +0000 (Tue, 05 Jun 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/templates/base/component.xsl
trunk/controller/templates/base/css/base.css
trunk/controller/templates/base/procedure/view_procedures_for_control.xsl
Modified: trunk/controller/templates/base/component.xsl
===================================================================
--- trunk/controller/templates/base/component.xsl 2012-06-05 07:10:42 UTC
(rev 9503)
+++ trunk/controller/templates/base/component.xsl 2012-06-05 07:32:43 UTC
(rev 9504)
@@ -72,7 +72,7 @@
<xsl:choose>
<xsl:when test="type = 'date-picker'">
- <td valign="top">
+ <td>
<div class="date-picker">
<input id="filter_{name}"
name="filter_{name}" type="text">
<xsl:attribute
name="value"><xsl:value-of select="../../../filters/*[local-name() =
$filter_key]"/></xsl:attribute>
@@ -81,7 +81,7 @@
</td>
</xsl:when>
<xsl:when test="type = 'autocomplete'">
- <td valign="top" width="160px">
+ <td width="160px">
<div style="width:140px">
<input
id="filter_{name}_name" name="filter_{name}_name" type="text">
<xsl:attribute
name="value"><xsl:value-of select="../../../filters/*[local-name() =
$filter_key_name]"/></xsl:attribute>
@@ -147,7 +147,7 @@
</td>
</xsl:when>
<xsl:when test="type = 'filter'">
- <td valign="top">
+ <td>
<xsl:variable name="name"><xsl:value-of
select="name"/></xsl:variable>
<select id="{$name}" name="{$name}"
onMouseout="window.status='';return true;">
@@ -183,12 +183,12 @@
</xsl:for-each>
</tr>
<xsl:if test="item/text and normalize-space(item/text)">
- <thead style="background:none">
+ <thead>
<tr>
<xsl:for-each select="item">
<td>
<xsl:if
test="name">
- <label
style='margin:auto 0.25em'>
+ <label>
<xsl:attribute name="for"><xsl:value-of select="phpgw:conditional(not(name),
'', name)"/></xsl:attribute>
<xsl:value-of select="phpgw:conditional(not(text), '', text)"/>
</label>
@@ -236,85 +236,4 @@
</script>
-</xsl:template>
-<!--
-<xsl:template match="lists">
-
-<div style="background: none repeat scroll 0 0 #EDF5FF;border: 1px solid
#243356;margin: 20px;padding: 20px;">
--->
- <!-- When control area is chosen an ajax request is executed.
The operation fetches controls from db and populates the control list below.
- The ajax opearation is handled in file ajax.js
- -->
- <!--
- <select id="control_area_list" name="control_area_list">
- <xsl:for-each select="control_area_list">
- <xsl:variable
name="control_area_id"><xsl:value-of select="id"/></xsl:variable>
- <option value="{$control_area_id}">
- <xsl:value-of select="title"/>
- </option>
- </xsl:for-each>
- </select>
-
- <select id="control_list" name="control_list">
- <xsl:for-each select="control_list">
- <xsl:variable name="control_id"><xsl:value-of
select="id"/></xsl:variable>
- <option value="{$control_id}">
- <xsl:value-of select="title"/>
- </option>
-
- </xsl:for-each>
- </select>
- </div>
-
- <div style="background: none repeat scroll 0 0 #EDF5FF;border: 1px
solid #243356;margin: 20px;padding: 20px;">
- <select id="building_types" name="building_types">
- <xsl:for-each select="building_types">
- <xsl:variable
name="building_type_id"><xsl:value-of select="id"/></xsl:variable>
- <option value="{$building_type_id}">
- <xsl:value-of select="name"/>
- </option>
-
- </xsl:for-each>
- </select>
-
- <select id="category_types" name="category_types">
- <xsl:for-each select="category_types">
- <xsl:variable
name="category_type_id"><xsl:value-of select="id"/></xsl:variable>
- <option value="{$category_type_id}">
- <xsl:value-of select="name"/>
- </option>
-
- </xsl:for-each>
- </select>
-
- <select id="district_list" name="district_list">
- <xsl:for-each select="district_list">
- <xsl:variable
name="district_list_id"><xsl:value-of select="id"/></xsl:variable>
- <option value="{$district_list_id}">
- <xsl:value-of select="name"/>
- </option>
-
- </xsl:for-each>
- </select>
-
- <select id="part_of_town_list" name="part_of_town_list">
- <xsl:for-each select="part_of_town_list">
- <xsl:variable
name="part_of_town_list_id"><xsl:value-of select="id"/></xsl:variable>
- <option value="{$part_of_town_list_id}">
- <xsl:value-of select="name"/>
- </option>
-
- </xsl:for-each>
- </select>
- <select id="responsibility_roles" name="responsibility_roles">
- <xsl:for-each select="responsibility_roles_list">
- <xsl:variable
name="responsibility_roles_list_id"><xsl:value-of select="id"/></xsl:variable>
- <option value="{$responsibility_roles_list_id}">
- <xsl:value-of select="name"/>
- </option>
-
- </xsl:for-each>
- </select>
- </div>
-</xsl:template>
--->
+</xsl:template>
\ No newline at end of file
Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css 2012-06-05 07:10:42 UTC
(rev 9503)
+++ trunk/controller/templates/base/css/base.css 2012-06-05 07:32:43 UTC
(rev 9504)
@@ -1889,4 +1889,36 @@
#details table td{
text-align: left;
padding-right: 10px;
+}
+
+#procedures h2, #procedures h4{
+ margin:5px 0;
+}
+
+#procedures .desc {
+ margin-left:10px;
+}
+
+#procedures h3 {
+ margin:15px 0 3px 0;
+}
+
+#procedures h4 .doc{
+ margin-left:10px;
+}
+
+#procedures #groups .group{
+ margin-left:10px;
+}
+
+#procedures #groups .group{
+ margin-left:10px;
+}
+
+#procedures #groups .group{
+ margin-bottom:10px;
+}
+
+#procedures .btn_sm {
+ margin-left:5px;
}
\ No newline at end of file
Modified:
trunk/controller/templates/base/procedure/view_procedures_for_control.xsl
===================================================================
--- trunk/controller/templates/base/procedure/view_procedures_for_control.xsl
2012-06-05 07:10:42 UTC (rev 9503)
+++ trunk/controller/templates/base/procedure/view_procedures_for_control.xsl
2012-06-05 07:32:43 UTC (rev 9504)
@@ -1,9 +1,11 @@
<!-- $Id: procedure_item.xsl 8485 2012-01-05 08:21:03Z erikhl $ -->
<xsl:template match="data">
- <h3 style="margin:5px 0;">Prosedyre for <xsl:value-of
select="control_procedure/title"/></h3>
- <div>
+<div id="procedures">
+ <h2>Prosedyre for <xsl:value-of select="control_procedure/title"/></h2>
+
+
<a class="btn_m" id="print-control-items" target="_blank">
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uiprocedure.print_procedure</xsl:text>
@@ -17,27 +19,27 @@
</xsl:attribute>
Skriv ut prosedyre
</a>
- </div>
+
<xsl:if test="control_procedure/documents/child::node()">
- <h4 style="margin:5px 0;">Dokumenter</h4>
+ <h4>Dokumenter</h4>
<xsl:for-each select="control_procedure/documents">
- <div style="margin-left:10px;">
+ <div class="doc">
<xsl:variable name="doc_link"><xsl:value-of
select='document_link'/></xsl:variable>
<span><a href="{$doc_link}"><xsl:value-of
select="title"/></a></span>
- <span style="margin-left:10px;"><xsl:value-of
select="description" disable-output-escaping="yes"/></span>
+ <span class="desc"><xsl:value-of
select="description" disable-output-escaping="yes"/></span>
</div>
</xsl:for-each>
</xsl:if>
- <h3 style="margin:15px 0 3px 0;">Prosedyrer for grupper</h3>
+ <h3>Prosedyrer for grupper</h3>
<ul id="groups">
<xsl:for-each select="group_procedures_array">
<li>
<h4><xsl:value-of
select="procedure/title"/></h4>
- <div style="margin-bottom:10px;">
+ <div class="group">
<span>Gruppe: </span><xsl:value-of
select="control_group/group_name"/>
- <a class="btn_sm"
style="margin-left:5px;" id="print-control-items" target="_blank">
+ <a class="btn_sm"
id="print-control-items" target="_blank">
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uiprocedure.print_procedure</xsl:text>
<xsl:text>&procedure_id=</xsl:text>
@@ -54,16 +56,17 @@
</a>
</div>
<xsl:if test="documents/child::node()">
- <h4 style="margin:5px 0;">Dokumenter</h4>
+ <h4>Dokumenter</h4>
<xsl:for-each select="documents">
- <div style="margin-left:10px;">
+ <div class="doc">
<xsl:variable
name="doc_link"><xsl:value-of select='document_link'/></xsl:variable>
<span><a
href="{$doc_link}"><xsl:value-of select="title"/></a></span>
- <span
style="margin-left:10px;"><xsl:value-of select="description"
disable-output-escaping="yes"/></span>
+ <span
class="desc"><xsl:value-of select="description"
disable-output-escaping="yes"/></span>
</div>
</xsl:for-each>
</xsl:if>
</li>
</xsl:for-each>
</ul>
+</div>
</xsl:template>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9504],
Torstein <=