[Fmsystem-commits] [9680]

[Torstein]

Revision: 9680
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9680
Author:   vator
Date:     2012-06-27 10:52:55 +0000 (Wed, 27 Jun 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.socontrol.inc.php
    
trunk/controller/templates/base/control_location/register_control_to_location.xsl
    trunk/controller/templates/base/css/base.css

Modified: trunk/controller/inc/class.socontrol.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol.inc.php        2012-06-27 10:43:12 UTC 
(rev 9679)
+++ trunk/controller/inc/class.socontrol.inc.php        2012-06-27 10:52:55 UTC 
(rev 9680)
@@ -235,8 +235,6 @@
                        
                        $sql   = "SELECT c.id as control_id, c.*, ";
                        $sql  .= "bim_item.type as component_type, bim_item.id 
as component_id, bim_item.location_code, bim_item.address, ";
-                       //$sql  .= "cast(xpath('*/text()', xml_representation) 
as text[]) AS xml ";
-                       //$sql  .= "xpath('/', bim_item.xml_representation) as 
xml ";
                        $sql  .= "bim_item.xml_representation as xml, 
cl.location_id ";
                        $sql  .= "FROM controller_control_component_list cl ";
                        $sql  .= "JOIN fm_bim_item bim_item on cl.component_id 
= bim_item.id ";
@@ -258,7 +256,7 @@
                        $sql .= "OR c.start_date > $from_date AND c.start_date 
< $to_date) ";
                        
                        $sql  .= "ORDER BY bim_item.id ";
-                        var_dump($sql);
+                        
                        $this->db->query($sql);
                        
                        $component_id = 0;

Modified: 
trunk/controller/templates/base/control_location/register_control_to_location.xsl
===================================================================
--- 
trunk/controller/templates/base/control_location/register_control_to_location.xsl
   2012-06-27 10:43:12 UTC (rev 9679)
+++ 
trunk/controller/templates/base/control_location/register_control_to_location.xsl
   2012-06-27 10:52:55 UTC (rev 9680)
@@ -41,7 +41,7 @@
                        The ajax opearation is handled in ajax.js 
                -->
                 <div class="error_msg">Du må velge kontroll før du kan legge 
til bygg</div>
-                <label>Velg kontroll</label> 
+                <h4>Velg kontroll</h4> 
                 <select id="control_area_list" name="control_area_list">
                        <option value="">Velg kontrollområde</option>
                        <xsl:for-each select="control_areas_array">
@@ -92,7 +92,7 @@
 
 <xsl:template name="filter_list" xmlns:php="http://php.net/xsl";>
        <div id="choose-location">
-               <label>Velg bygg/eiendom</label>
+               <h4>Velg bygg/eiendom</h4>
          <ul id="filters">
                <li>
                        <input type="hidden" id="hidden_control_id" 
name="control_id">

Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css        2012-06-27 10:43:12 UTC 
(rev 9679)
+++ trunk/controller/templates/base/css/base.css        2012-06-27 10:52:55 UTC 
(rev 9680)
@@ -1854,6 +1854,10 @@
     margin: 20px;
 }
 
+#queryForm #choose-location {
+    margin: 0;
+}
+
 #choose-location h4{
   display: block;
   font-size: 17px;