[Fmsystem-commits] [9479]

[Torstein]

Revision: 9479
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9479
Author:   vator
Date:     2012-05-31 13:39:22 +0000 (Thu, 31 May 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/templates/base/calendar/view_calendar_year.xsl
    trunk/controller/templates/base/css/base.css

Modified: trunk/controller/templates/base/calendar/view_calendar_year.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_year.xsl     
2012-05-31 13:00:31 UTC (rev 9478)
+++ trunk/controller/templates/base/calendar/view_calendar_year.xsl     
2012-05-31 13:39:22 UTC (rev 9479)
@@ -5,7 +5,7 @@
 
 <style>
        .ui-autocomplete-loading { background: white 
url('images/ui-anim_basic_16x16.gif') right center no-repeat; }
-       #searchLocationName { width: 25em; }
+       #search-location-name { width: 25em; }
        
        
        .ui-combobox {
@@ -37,7 +37,7 @@
        var oArgs = {menuaction:'property.bolocation.get_locations_by_name'};
        var baseUrl = phpGWLink('index.php', oArgs, false);
 
-       $("#searchLocationName").autocomplete({
+       $("#search-location-name").autocomplete({
                source: function( request, response ) {
                        $.ajax({
                                url: baseUrl,
@@ -66,9 +66,6 @@
                  chooseLocation( ui.item.label, ui.item.value);
                }
        });
-       
-       
-       
 });
 
 function chooseLocation( label, value ){
@@ -101,25 +98,38 @@
                        <h3>Kalenderoversikt for <span 
class="year"><xsl:value-of select="current_year"/></span></h3>
                        
                        <!-- =====================  SEARCH FOR LOCATION  
================= -->
-                       <div id="searchLocation" class="selectBox">
+                       <div id="search-location" class="select-box">
                                <label>Søk etter andre bygg/eiendommer</label>
                                <input type="hidden" id="currentYear">
                                        <xsl:attribute name="value">
                                                <xsl:value-of 
select="current_year"/>
                                        </xsl:attribute>
                                </input>
-                               <input type="text" value="" 
id="searchLocationName" />
+                               <input type="text" value="" 
id="search-location-name" />
                        </div>
                        
                        <!-- =====================  SELECT LIST FOR MY 
LOCATIONS  ================= -->
-                       <div id="chooseMyLocation" class="selectBox">
+                       <div id="choose-my-location" class="select-box">
                                <label>Velg et annet bygg du har ansvar 
for</label>
                                <xsl:call-template name="select_my_locations" />
                        </div>
                </div>
+               
                <div class="middle">
-                       
-                       <div id="chooseBuilding" class="selectBox">
+                       <div id="choose-building" class="select-box">
+                               <xsl:if test="location_level > 1">
+                                       <a>
+                                               <xsl:attribute name="href">
+                                                       
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:text>
+                                                       
<xsl:text>&amp;year=</xsl:text>
+                                                       <xsl:value-of 
select="current_year"/>
+                                                       
<xsl:text>&amp;location_code=</xsl:text>
+                                                       <xsl:value-of 
select="current_location/loc1"/>
+                                               </xsl:attribute>
+                                               Vis kontrollplan for eiendom
+                                       </a> 
+                               </xsl:if>
+
                                <label>Velg et annet bygg på eiendommen</label>
                                <xsl:call-template 
name="select_buildings_on_property" />
                        </div>

Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css        2012-05-31 13:00:31 UTC 
(rev 9478)
+++ trunk/controller/templates/base/css/base.css        2012-05-31 13:39:22 UTC 
(rev 9479)
@@ -768,6 +768,7 @@
     margin-bottom: 20px;
     padding: 15px;
 }
+
 .box {
     background: none repeat scroll 0 0 #EDF5FF;
     border: 1px solid #eee;
@@ -778,6 +779,7 @@
     background: none repeat scroll 0 0 #FEFBF7;
     border: 1px solid #FEEDEA;
 }
+
 .box_header {
     background: none repeat scroll 0 0 #CFE6FF;
     border-color: #C7DCF2;
@@ -790,11 +792,13 @@
     padding: 6px 0 6px 15px;
     text-align: left;
 }
+
 .box_header.ext {
     background: none repeat scroll 0 0 #F57056;
     border-color: #EB9685;
     color: #FFFFFF;
 }
+
 .btn, .btn_m, .btn_sm {
     background: none repeat scroll 0 0 #4F9AEA;
     border: 1px solid #428AD7;
@@ -810,15 +814,18 @@
     padding: 2px 10px;
     font-size: 12px;
 }
+
 .btn_sm{
     font-size: 11px;
     padding: 1px 4px;
 }
+
 .btn.cancel, .btn_m.cancel {
     background: none repeat scroll 0 0 #EEEEEE;
     border: 1px solid #CCCCCC;
     color: #333333;
 }
+
 .btn.focus, .btn_m.focus {
     background: none repeat scroll 0 0 #F57056;
     border-color: #EE836F -moz-use-text-color #CB563F;
@@ -838,6 +845,7 @@
 #main_content.groups{
        cursor: default;        
 }
+
 #main_content h1{
        margin-top:0;
 }
@@ -850,6 +858,7 @@
     text-align: right;
     width: 50px;
 }
+
 input.date {
     width: 65px;
     text-align: right;
@@ -870,24 +879,30 @@
     height: 20px;
     padding-left: 25px;
 }
+
 .check_list li.heading div {
     margin: 0 5px;
     padding: 2px;
 }
+
 .check_list li div.order_nr{
        width:15px;
 }
+
 .check_list li div.status {
     padding-left: 10px;
     width: 50px;
 }
+
 .check_list li div.title{
     width: 600px;
     text-align:left;
 }
+
 .check_list li.heading div.title{
     text-align:center;
 }
+
 .check_list li{
        overflow:hidden;
 }
@@ -901,6 +916,7 @@
     clear: both;
     margin:0;
 }
+
 #check_list_details form .row {
     padding: 0.1em 0;
 }
@@ -910,14 +926,17 @@
        width:150px;
        display: inline-block;
 }
+
 #check_list_details .comment {
     clear: both;
     float: left;
     margin-top: 20px;
 }
+
 #check_list_details .comment label {
     vertical-align: top;
 }
+
 #check_list_details textarea{
        width:400px;
        height:100px;
@@ -927,6 +946,7 @@
     float: left;
     vertical-align: top;
 }
+
 #check_list_details .col_2 {
     margin-left: 15%;
     width: 19%;
@@ -938,6 +958,7 @@
     font-weight: bold;
     width: 100px;
 }
+
 fieldset.tab_check_list_details {
     padding: 0 0 10px 0;
 }
@@ -949,11 +970,13 @@
        vertical-align:top;
        float:left;
 }
+
 fieldset.check_item_details h3 {
     font-size: 15px;
     font-weight: bold;
     margin: 10px 0;
 }
+
 h3.check_item_details{
        margin-bottom:0;        
 }
@@ -972,27 +995,35 @@
     height: 100px;
     margin-top: 6px;
     width: 63%;
-}.check_item label{
+}
+
+.check_item label{
        width:150px;    
 }
+
 .new_item a#innertoolbar-button{
        background: grey;
        font-weight: bold;
 }
+
 #frm_save_check_items input[type="submit"]{
        padding: 3px 30px;      
 }
+
 .form-buttons-top{
        float: right;
        margin-bottom:5px;
 }
+
 .form-buttons-top input[type="submit"]{
        margin:0;
 }
+
 #frm_save_check_items h1 {
     float: left;
     margin: 5px;
 }
+
 ul.check_list {
        width: 925px;   
 }
@@ -1003,12 +1034,11 @@
     font-size: 19px;
     margin: 0;
 }
+
 #control_plan .top h3 .year{
    margin-left:5px;
 }
-#control_plan .top form{
-   float:right;
-}
+
 #control_plan .middle {
     background: none repeat scroll 0 0 #EDF5FF;
     border-color: #DBE5EF;
@@ -1029,31 +1059,39 @@
     float: right;
     padding: 1em;
 }
+
 ul#icon_color_map li {
     font-size: 12px;
     padding: 3px 0;
 }
+
 ul#icon_color_map span{
        margin-left: 10px;
 }
+
 #calendar {
     width: 100%
 }
+
 #calendar th {
     font-weight: bold;
     font-size:15px;
     background:none;
 }
+
 #calendar th, #calendar td {
     padding: 10px;
     text-align: center;
 }
+
 #calendar.month th, #calendar.month td {
     padding: 5px 3px;
 }
+
 #calendar .even {
     background: none repeat scroll 0 0 #DEEAF8;
 }
+
 #cal_wrp {
     border: 1px solid #DBE5EF;
     background: none repeat scroll 0 0 #EDF5FF;
@@ -1061,48 +1099,59 @@
     clear: both;
     padding: 1em;
 }
+
 .control_details_wrp div {
     float: left;
     height: 30px;
     padding: 0 10px;
     width: 100px;
 }
+
 #calendar .title, #calendar .assigned {
        width: 150px;
 }
+
 #calendar .frequency {
     margin-right: 10px;
     width: 100px;
 }
+
 #calendar .frequency, #calendar .title, #calendar .assigned, #calendar 
.location_name {
     text-align: left;
 }
+
 #calendar .frequency .pre {
     margin-right: 3px;
 }
+
 #calendar .frequency .val {
     text-transform: lowercase;
 }
+
 .cal_info_msg {
        font-size: 16px;
     padding: 40px 20px;        
 }
+
 #showYear{
        display:block;
        font-weight: bold;
        font-size: 14px;
        float:left;
 }
+
 #showYear img {
     margin-right: 5px;
     vertical-align: bottom;
 }
+
 #calNav {
     clear: both;
     font-size: 14px;
     font-weight: bold;
     padding-top: 1em;
 }
+
 #calNav img{
     vertical-align:bottom;
 }
@@ -1112,9 +1161,11 @@
     float: right;
     padding-top: 5px;
 }
+
 #calNav a.showNext img{
     margin-left:5px;
 }
+
 #calNav a.showPrev {
     display: block;
     float: left;
@@ -1122,9 +1173,11 @@
     padding-top: 5px;
     vertical-align: sub;
 }
+
 #calNav a.showPrev img{
     margin-right:5px;
 }
+
 #calNav .current {
     display: block;
     float: left;
@@ -1138,23 +1191,27 @@
     display: block;
     font-size: 10px;
     font-weight: bold;
-    padding-left: 3px;
+    padding-top: 2px;
     text-align: center;
     text-decoration: none;
 }
+
 .info_box_wrp {
-       background: url("../../../images/status_icon_red_empty.png") no-repeat 
scroll 50% 50% transparent;
+    background: url("../../../images/status_icon_red_empty.png") no-repeat 
scroll 50% 50% transparent;
     height: 15px;
     position: relative;
     text-align: center;
-    width: 15px;
+    width: 100%;
 }
+
 #calendar.month a.view_info_box {
     padding-left: 5px;
 }
+
 .days_wrp a.view_info_box {
     left: 8px;
 }
+
 #info_box {
     background: none repeat scroll 0 0 #EDF5FF;
     border: 1px solid #98B4D6;
@@ -1686,28 +1743,35 @@
     background: none repeat scroll 0 0 #EAEFF5;
 }
 
-#searchLocation {
+#search-location {
     float: right;
     margin-bottom: 10px;
 }
 
-#chooseMyLocation {
+#choose-my-location {
     float: right;
     margin-right: 10px;
 }
 
-#chooseBuilding {
+#choose-building {
     float: left;
 }
 
-.selectBox{
+.select-box { 
                background: none repeat scroll 0 0 #FEFBF4;
     border: 1px solid #DDDDDD;
     border-radius: 5px 5px 5px 5px;
     padding: 1em;      
 }
 
-.selectBox label{
+.select-box label{
        margin-bottom:5px;
        display: block; 
+}
+
+.select-box a{
+       display: block;
+  font-weight: bold;
+  padding: 0 0 10px;
+  text-align: justify; 
 }
\ No newline at end of file