[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9516]
From: |
Torstein |
Subject: |
[Fmsystem-commits] [9516] |
Date: |
Wed, 06 Jun 2012 10:25:58 +0000 |
Revision: 9516
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9516
Author: vator
Date: 2012-06-06 10:25:58 +0000 (Wed, 06 Jun 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/templates/base/css/base.css
trunk/controller/templates/base/procedure/print_procedure.xsl
trunk/controller/templates/base/procedure/view_procedures_for_control.xsl
Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css 2012-06-05 17:48:44 UTC
(rev 9515)
+++ trunk/controller/templates/base/css/base.css 2012-06-06 10:25:58 UTC
(rev 9516)
@@ -1,34 +1,13 @@
-#invoice_details { float: left; width: 30%; }
#list_navigation { float: left; width: 30%; }
#user_messages { float: right; width: 40%;}
-#contract_lists {width: 100%; float: left; background-color: #EFEFEF; border:
1px solid #ABABAB; padding-left: 1em; margin-top: 1em;}
-form#invoice_run {margin: 2em;}
-form#invoice_run th {
- background-color: #CDCDCD;
- padding: 5px;
- border: 1px solid #ABABAB;
- font-weight: bolder;
- }
-div#contract_lists td {
- margin:0;
- padding:4px 10px;
-}
-form#invoice_run td {
- border: 1px solid #CDCDCD;
-}
-div#invoice_details dt{
- float:left;
- font-weight: bolder;
- margin-right: 1em;
-}
div.content {
margin: 2em;
}
.hd {
margin-bottom: 0;
text-align: center;
-}
+}
.hd img {
vertical-align: middle;
}
@@ -65,17 +44,6 @@
}
.clr { clear: both;}
-#dashboard {padding: 1em;}
-#dashborad_column_1 { float:left; width:50%;}
-#dashboard_column_2 { margin-left:50%; width:50%;}
-
-#inactive {
- background-color: #ff5555;
- width: 10em;
- padding: 1em;
- border: 0.2em dotted #000000;
- letter-spacing: 2px;
-}
#active {
background-color: #ffffff;
width: 10em;
@@ -268,23 +236,7 @@
dl.proplist-col dd.address {
white-space: pre;
}
-#week-selector { margin: 1em 0;}
-#week-selector li { display: inline; padding-right: .5em;}
-#schedule_container tr td { border-top: 1px solid #ccc; background: white;
white-space: nowrap; }
-#schedule_container tr td:first-child { background: #eee; }
-#schedule_container tr.time td { border-top: 1px solid #444;}
-#schedule_container .color1 { background: #ccf;}
-#schedule_container .color2 { background: #cfc;}
-#schedule_container .color3 { background: #fcc;}
-#schedule_container .color4 { background: #ffb;}
-#schedule_container .color5 { background: #bff;}
-#schedule_container .color6 { background: #fbf;}
-
-#boundary-table td, #boundary-table th {
- padding: .1em .2em;
-}
-
.date-container {
margin-bottom: .8em;
white-space: nowrap;
@@ -563,6 +515,10 @@
display:none;
}
+#control-items .print{
+ margin-top: 20px;
+}
+
/* ======================================= ADD CONTROL ITEM LIST VALUES
========================================= */
#add_control_item_option_panel {
@@ -617,6 +573,11 @@
width: 45px;
}
+#frm_control_items{
+ clear:left;
+ margin-top:10px;
+}
+
/* ======================================= CONTROL TAB VIEW
========================================= */
#control_tabview .yui-navset, #control_location_tabview .yui-navset{
margin:0;
@@ -653,6 +614,28 @@
ul.groups a:visited{
color:#000;
}
+
+ul.items {
+ list-style: none outside none;
+ margin: 0 20px;
+ padding: 0;
+ position: relative;
+}
+ul.items li.list_item{
+ position:relative;
+ z-index: 1;
+ opacity: 1;
+ filter: alpha(opacity=100);
+ top: 0px;
+ left: 0px;
+}
+
+.control_items li{
+ padding: 5px;
+}
+
+/* ======================================= DRAG LIST
========================================= */
+
.drag_group{
margin-bottom: 10px;
}
@@ -668,20 +651,6 @@
padding-left:0;
background: #dedede;
}
-ul.items {
- list-style: none outside none;
- margin: 0 20px;
- padding: 0;
- position: relative;
-}
-ul.items li.list_item{
- position:relative;
- z-index: 1;
- opacity: 1;
- filter: alpha(opacity=100);
- top: 0px;
- left: 0px;
-}
/* ======================================= EXPAND LIST
========================================= */
@@ -713,11 +682,6 @@
display: none;
}
-#frm_control_items{
- clear:left;
- margin-top:10px;
-}
-
dl.proplist, dl.proplist-col {
margin: 0;
padding-left: 0;
@@ -839,7 +803,7 @@
color: #FFFFFF;
}
-.btn, .btn_m, .btn_sm {
+.btn, .btn_m, .btn-sm {
background: none repeat scroll 0 0 #4F9AEA;
border: 1px solid #428AD7;
border-radius: 4px 4px 4px 4px;
@@ -852,12 +816,12 @@
}
.btn_m{
- padding: 2px 10px;
+ padding: 2px 6px;
font-size: 12px;
}
-.btn_sm{
- font-size: 11px;
+.btn-sm {
+ font-size: 12px;
padding: 1px 4px;
}
@@ -1759,9 +1723,11 @@
margin-top: 5px;
padding: 4px 5px;
}
+
input.focus, select.focus{
border: 2px solid #dae6f4;
}
+
div.controller_checklist {
padding: 20px;
border: 1px solid #ABABAB;
@@ -1769,11 +1735,15 @@
/* ===================== CONTROL LOCATION ===================== */
-#choose_control{
- margin: 10px;
- padding: 10px;
- width: 25%;
+#choose_control {
+ float: right;
+ width: 500px;
}
+
+#choose_control select {
+ width: 245px;
+}
+
.error_msg {
color: red;
display: none;
@@ -1834,6 +1804,20 @@
margin-bottom: 0.5em;
}
+/* ============================= PROCEDURES ======================= */
+
+#view-procedures .btn-sm {
+ height: auto;
+ margin-left: 11px;
+ vertical-align: middle;
+}
+#view-procedures .box {
+ background: none repeat scroll 0 0 #E7EFF8;
+ border: 1px solid #DDDDDD;
+ margin-bottom: 20px;
+ padding: 0 20px;
+}
+
/* ============================= IMAGE LOADER ======================= */
img#loading {
@@ -1841,10 +1825,6 @@
vertical-align: middle;
}
-#print-control-items{
- margin-top:20px;
-}
-
#exec-print {
margin:20px 0 0 40px;
}
@@ -1931,6 +1911,10 @@
width: 140px;
}
-. yui-skin-sam thead{
+.yui-skin-sam thead{
background: none;
}
+
+p.no_items_msg {
+ padding: 5px;
+}
\ No newline at end of file
Modified: trunk/controller/templates/base/procedure/print_procedure.xsl
===================================================================
--- trunk/controller/templates/base/procedure/print_procedure.xsl
2012-06-05 17:48:44 UTC (rev 9515)
+++ trunk/controller/templates/base/procedure/print_procedure.xsl
2012-06-06 10:25:58 UTC (rev 9516)
@@ -75,16 +75,16 @@
}
.btn {
- background: none repeat scroll 0 0 #2647A0;
- border: 1px solid #173073;
- color: #FFFFFF;
- cursor: pointer;
- display: inline-block;
- font-family: arial;
- padding: 5px 20px;
- text-decoration: none;
- margin-top:20px;
- }
+ background: none repeat scroll 0 0 #4F9AEA;
+ border: 1px solid #428AD7;
+ border-radius: 4px 4px 4px 4px;
+ color: #FFFFFF;
+ cursor: pointer;
+ display: inline-block;
+ margin-right: 10px;
+ padding: 5px 10px;
+ text-decoration: none;
+}
ol{
margin: 0;
Modified:
trunk/controller/templates/base/procedure/view_procedures_for_control.xsl
===================================================================
--- trunk/controller/templates/base/procedure/view_procedures_for_control.xsl
2012-06-05 17:48:44 UTC (rev 9515)
+++ trunk/controller/templates/base/procedure/view_procedures_for_control.xsl
2012-06-06 10:25:58 UTC (rev 9516)
@@ -2,44 +2,47 @@
<xsl:template match="data">
-<div id="procedures">
- <h2>Prosedyre for <xsl:value-of select="control_procedure/title"/></h2>
+<div id="view-procedures">
+ <h2>Prosedyrer</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>
- <xsl:text>&procedure_id=</xsl:text>
- <xsl:value-of select="control_procedure/id"/>
- <xsl:text>&control_id=</xsl:text>
- <xsl:value-of select="control/id"/>
- <xsl:text>&location_code=</xsl:text>
- <xsl:value-of select="location/location_code"/>
-
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
- </xsl:attribute>
- Skriv ut prosedyre
- </a>
-
- <xsl:if test="control_procedure/documents/child::node()">
- <h4>Dokumenter</h4>
- <xsl:for-each select="control_procedure/documents">
- <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 class="desc"><xsl:value-of
select="description" disable-output-escaping="yes"/></span>
- </div>
- </xsl:for-each>
- </xsl:if>
+ <div class="box">
+ <h3>Prosedyre for kontroll</h3>
+ <h4><xsl:value-of select="control_procedure/title"/>
+ <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>
+ <xsl:value-of
select="control_procedure/id"/>
+ <xsl:text>&control_id=</xsl:text>
+ <xsl:value-of select="control/id"/>
+ <xsl:text>&location_code=</xsl:text>
+ <xsl:value-of
select="location/location_code"/>
+
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
+ </xsl:attribute>
+ Skriv ut
+ </a>
+ </h4>
+
+ <xsl:if test="control_procedure/documents/child::node()">
+ <h4>Dokumenter</h4>
+ <xsl:for-each select="control_procedure/documents">
+ <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 class="desc"><xsl:value-of
select="description" disable-output-escaping="yes"/></span>
+ </div>
+ </xsl:for-each>
+ </xsl:if>
+ </div>
+ <div class="box">
<h3>Prosedyrer for grupper</h3>
-
- <ul id="groups">
+ <ul>
<xsl:for-each select="group_procedures_array">
<li>
- <h4><xsl:value-of
select="procedure/title"/></h4>
- <div class="group">
- <span>Gruppe: </span><xsl:value-of
select="control_group/group_name"/>
- <a class="btn_sm"
id="print-control-items" target="_blank">
+ <h4><xsl:value-of
select="control_group/group_name"/>: <xsl:value-of select="procedure/title"/>
+
+ <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,7 +57,8 @@
</xsl:attribute>
Skriv ut
</a>
- </div>
+ </h4>
+
<xsl:if test="documents/child::node()">
<h4>Dokumenter</h4>
<xsl:for-each select="documents">
@@ -68,5 +72,6 @@
</li>
</xsl:for-each>
</ul>
+ </div>
</div>
</xsl:template>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9516],
Torstein <=