[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9485]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [9485] |
|
Date: |
Mon, 04 Jun 2012 08:39:53 +0000 |
Revision: 9485
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9485
Author: vator
Date: 2012-06-04 08:39:52 +0000 (Mon, 04 Jun 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.uicalendar.inc.php
trunk/controller/templates/base/calendar/check_list_status_checker.xsl
trunk/controller/templates/base/calendar/view_calendar_month.xsl
trunk/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
trunk/controller/templates/base/calendar/view_calendar_year.xsl
trunk/controller/templates/base/check_list/print_check_list.xsl
trunk/controller/templates/base/check_list/view_cases_for_check_list.xsl
trunk/controller/templates/base/check_list/view_check_lists.xsl
trunk/controller/templates/base/check_list/view_control_items.xsl
trunk/controller/templates/base/check_list/view_open_cases.xsl
trunk/controller/templates/base/control/control.xsl
trunk/controller/templates/base/control_item/view_control_item_list.xsl
trunk/controller/templates/base/control_location/register_control_to_location.xsl
trunk/controller/templates/base/control_location/view_locations_for_control.xsl
trunk/controller/templates/base/css/base.css
Modified: trunk/controller/inc/class.uicalendar.inc.php
===================================================================
--- trunk/controller/inc/class.uicalendar.inc.php 2012-06-02 18:38:11 UTC
(rev 9484)
+++ trunk/controller/inc/class.uicalendar.inc.php 2012-06-04 08:39:52 UTC
(rev 9485)
@@ -106,6 +106,29 @@
$location_code =
$my_locations[0]["location_code"];
}
+ $level = count(explode('-', $location_code));
+
+ // Property level
+ if($level == 1){
+ $property_location_code = $location_code;
+ }
+ // Building level
+ else if($level > 1){
+ $split_loc_code_array = explode('-',
$location_code);
+ $property_location_code =
$split_loc_code_array[0];
+ }
+
+ if($manage){
+ $criteria = array();
+ $criteria['location_code'] =
$property_location_code;
+ $criteria['field_name'] = 'loc2_name';
+ $criteria['child_level'] = '2';
+
+ $buildings_on_property = execMethod('property.solocation.get_children',
$criteria);
+ }else{
+ $buildings_on_property =
execMethod('property.solocation.get_children', $property_location_code);
+ }
+
// Fetches controls for location within specified time
period
$controls_for_location_array =
$this->so_control->get_controls_by_location($location_code, $from_date_ts,
$to_date_ts);
@@ -129,21 +152,26 @@
$data = array
(
- 'my_locations' =>
$my_locations,
- 'property_array' =>
$property_array,
- 'current_location' =>
$location_array,
- 'heading_array' =>
month_calendar::get_heading_array($year, $month),
+ 'buildings_on_property' =>
$buildings_on_property,
+ 'my_locations' =>
$my_locations,
+ 'property_array' =>
$property_array,
+ 'current_location' =>
$location_array,
+ 'heading_array' =>
month_calendar::get_heading_array($year, $month),
'controls_calendar_array' =>
$controls_calendar_array,
- 'date_format' =>
$date_format,
- 'current_year' => $year,
- 'current_month_nr' => $month,
+ 'date_format'
=> $date_format,
+ 'current_year'
=> $year,
+ 'current_month_nr' =>
$month,
+ 'location_level'
=> $level,
);
self::add_javascript('controller', 'controller',
'jquery.js');
self::add_javascript('controller', 'controller',
'ajax.js');
+ self::add_javascript('controller', 'controller',
'jquery-ui-1.8.20.custom.min.js');
+
self::add_stylesheet('controller/templates/base/css/jquery-ui-1.8.20.custom.css');
self::render_template_xsl(array('calendar/view_calendar_month',
'calendar/check_list_status_checker',
-
'calendar/icon_color_map', 'calendar/select_my_locations'), $data);
+
'calendar/icon_color_map', 'calendar/select_my_locations',
+
'calendar/select_buildings_on_property'), $data);
}
public function view_calendar_for_year()
Modified: trunk/controller/templates/base/calendar/check_list_status_checker.xsl
===================================================================
--- trunk/controller/templates/base/calendar/check_list_status_checker.xsl
2012-06-02 18:38:11 UTC (rev 9484)
+++ trunk/controller/templates/base/calendar/check_list_status_checker.xsl
2012-06-04 08:39:52 UTC (rev 9485)
@@ -68,14 +68,14 @@
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of
select="info/check_list_id"/>
</xsl:attribute>
- <span
style="display:none"><xsl:value-of select="info/id"/></span>
+ <span class="ext_info"><xsl:value-of
select="info/id"/></span>
<img height="15"
src="controller/images/status_icon_dark_green.png" />
</a>
</td>
</xsl:when>
<xsl:when test="status =
'CONTROL_DONE_OVER_TIME_WITHOUT_ERRORS'">
<td>
- <div style="position:relative;">
+ <div class="info_box_wrp">
<div id="info_box"></div>
<a>
<xsl:attribute name="href">
@@ -83,7 +83,7 @@
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of
select="info/check_list_id"/>
</xsl:attribute>
- <span
style="display:none"><xsl:value-of select="info/id"/></span>
+ <span
class="ext_info"><xsl:value-of select="info/id"/></span>
<img height="15"
src="controller/images/status_icon_light_green.png" />
</a>
</div>
@@ -99,7 +99,7 @@
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of
select="info/check_list_id"/>
</xsl:attribute>
- <span style="display:none">
+ <span class="ext_info">
<xsl:text>&check_list_id=</xsl:text><xsl:value-of
select="info/check_list_id"/>
<xsl:text>&phpgw_return_as=json</xsl:text>
</span>
@@ -124,7 +124,7 @@
<xsl:text>&month=</xsl:text>
<xsl:number />
</xsl:attribute>
- <span style="display:none">
+ <span class="ext_info">
<xsl:text>&check_list_id=</xsl:text><xsl:value-of
select="info/check_list_id"/>
<xsl:text>&phpgw_return_as=json</xsl:text>
</span>
Modified: trunk/controller/templates/base/calendar/view_calendar_month.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_month.xsl
2012-06-02 18:38:11 UTC (rev 9484)
+++ trunk/controller/templates/base/calendar/view_calendar_month.xsl
2012-06-04 08:39:52 UTC (rev 9485)
@@ -2,33 +2,141 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
<xsl:variable name="date_format">d/m-Y</xsl:variable>
+<script>
+<xsl:text>
+
+$(document).ready(function(){
+
+ var oArgs = {menuaction:'property.bolocation.get_locations_by_name'};
+ var baseUrl = phpGWLink('index.php', oArgs, false);
+
+ var location_type = $("#loc_type").val();
+
+ $("#search-location-name").autocomplete({
+ source: function( request, response ) {
+ location_type = $("#loc_type").val();
+
+ $.ajax({
+ url: baseUrl,
+ dataType: "json",
+ data: {
+ location_name: request.term,
+ level: location_type,
+ phpgw_return_as: "json"
+ },
+ success: function( data ) {
+ response( $.map( data, function( item )
{
+ return {
+ label: item.name,
+ value:
item.location_code
+ }
+ }));
+ }
+ });
+ },
+ focus: function (event, ui) {
+ $(event.target).val(ui.item.label);
+ return false;
+ },
+ minLength: 1,
+ select: function( event, ui ) {
+ chooseLocation( ui.item.label, ui.item.value);
+ }
+ });
+});
+
+function chooseLocation( label, value ){
+ var currentYear = $("#currentYear").val();
+ var currentMonth = $("#currentMonth").val();
+
+ var oArgs = {menuaction:'controller.uicalendar.view_calendar_for_year'};
+ var baseUrl = phpGWLink('index.php', oArgs, false);
+ var requestUrl = baseUrl + "&location_code=" + value +
"&year=" + currentYear + "&month=" + currentMonth;
+
+ window.location.replace(requestUrl);
+}
+
+</xsl:text>
+
+</script>
+
<div id="main_content">
- <div id="control_plan">
+ <div id="control_plan" class="month_view">
<div class="top">
- <h1>Kontrollplan for bygg/eiendom: <xsl:value-of
select="current_location/loc1_name"/></h1>
+ <xsl:choose>
+ <xsl:when test="location_level = 1">
+ <h1>Kontrollplan for eiendom:
<xsl:value-of select="current_location/loc1_name"/></h1>
+ </xsl:when>
+ <xsl:otherwise>
+ <h1>Kontrollplan for bygg:
<xsl:value-of select="current_location/loc2_name"/></h1>
+ </xsl:otherwise>
+ </xsl:choose>
+
<xsl:variable name="month_str">month <xsl:value-of
select="current_month_nr"/> capitalized</xsl:variable>
<h3>Kalenderoversikt for <xsl:value-of
select="php:function('lang', $month_str)" /><span class="year"><xsl:value-of
select="current_year"/></span></h3>
- <!-- ===================== SELECT MY LOCATIONS
================= -->
- <xsl:call-template name="select_my_locations" />
+ <!-- ===================== SEARCH FOR LOCATION
================= -->
+ <div id="search-location" class="select-box">
+ <div id="choose_loc">
+ <label>Søk etter andre <a
href="loc_type_2" class="btn active">Bygg</a><a href="loc_type_1"
class="btn">Eiendom</a>
+ <input id="loc_type"
type="hidden" name="loc_type" value="2" />
+ </label>
+ </div>
+ <input type="hidden" id="currentYear">
+ <xsl:attribute name="value">
+ <xsl:value-of
select="current_year"/>
+ </xsl:attribute>
+ </input>
+ <input type="hidden" id="currentMonth">
+ <xsl:attribute name="value">
+ <xsl:value-of
select="current_month_nr"/>
+ </xsl:attribute>
+ </input>
+ <input type="text" value=""
id="search-location-name" />
+ </div>
+
+ <!-- ===================== SELECT LIST FOR MY
LOCATIONS ================= -->
+ <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 class="middle">
+ <!-- ===================== SHOW CALENDAR FOR YEAR
================= -->
+ <a id="showYear">
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:text>
+ <xsl:text>&year=</xsl:text>
+ <xsl:value-of select="current_year"/>
+ <xsl:text>&location_code=</xsl:text>
+ <xsl:value-of
select="current_location/location_code"/>
+ </xsl:attribute>
+ <img height="20"
src="controller/images/left_arrow_simple_light_blue.png" />Årsoversikt
+ </a>
- <!-- ===================== COLOR ICON MAP
================= -->
- <xsl:call-template name="icon_color_map" />
+ <!-- ===================== COLOR ICON MAP =================
-->
+ <xsl:call-template name="icon_color_map" />
+
+ <!-- ===================== CHOOSE ANOTHER BUILDING ON PROPERTY
================= -->
+ <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>&year=</xsl:text>
+ <xsl:value-of
select="current_year"/>
+
<xsl:text>&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>
- <a id="showYear">
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:text>
- <xsl:text>&year=</xsl:text>
- <xsl:value-of select="current_year"/>
- <xsl:text>&location_code=</xsl:text>
- <xsl:value-of
select="current_location/location_code"/>
- </xsl:attribute>
- <img height="20"
src="controller/images/left_arrow_simple_light_blue.png" />Årsoversikt
- </a>
-
<!-- ===================== CALENDAR NAVIGATION
================= -->
<div id="calNav">
<xsl:choose>
Modified:
trunk/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
===================================================================
---
trunk/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
2012-06-02 18:38:11 UTC (rev 9484)
+++
trunk/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
2012-06-04 08:39:52 UTC (rev 9485)
@@ -28,24 +28,14 @@
</div>
<div class="middle">
- <!-- ===================== ICON COLOR MAP
================= -->
- <xsl:call-template name="icon_color_map" />
+ <!-- ===================== ICON COLOR MAP =================
-->
+ <xsl:call-template name="icon_color_map" />
- <!-- ===================== CALENDAR NAVIGATION
================= -->
- <div id="calNav">
+ <!-- ===================== CALENDAR NAVIGATION
================= -->
+ <div id="calNav">
<a class="showPrev month">
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_year_for_locations</xsl:text>
- <xsl:text>&year=</xsl:text>
- <xsl:value-of select="current_year"/>
- <xsl:text>&control_id=</xsl:text>
- <xsl:value-of select="control/id"/>
- </xsl:attribute>
- Årsoversikt
- </a>
- <a style="display:block;font-weight: bold;font-size:
14px;float:left;">
- <xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_month_for_locations</xsl:text>
<xsl:text>&year=</xsl:text>
<xsl:value-of select="current_year"/>
@@ -57,6 +47,8 @@
Årsoversikt
</a>
</div>
+
+ <!-- ===================== CALENDAR ================= -->
<div id="cal_wrp">
<table id="calendar" class="month">
<tr>
Modified: trunk/controller/templates/base/calendar/view_calendar_year.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-06-02 18:38:11 UTC (rev 9484)
+++ trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-06-04 08:39:52 UTC (rev 9485)
@@ -1,34 +1,7 @@
<!-- $Id$ -->
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
<xsl:variable name="date_format">d/m-Y</xsl:variable>
-
-
-<style>
- .ui-autocomplete-loading { background: white
url('images/ui-anim_basic_16x16.gif') right center no-repeat; }
- #search-location-name { width: 25em; }
-
- .ui-combobox {
- position: relative;
- display: inline-block;
- }
- .ui-button {
- position: absolute;
- top: 0;
- bottom: 0;
- margin-left: -1px;
- padding: 0;
- /* adjust styles for IE 6/7 */
- *height: 1.7em;
- *top: 0.1em;
- }
- .ui-autocomplete-input {
- margin: 0;
- padding: 0.3em;
- }
-
-</style>
-
<script>
<xsl:text>
@@ -124,6 +97,8 @@
</div>
<div class="middle">
+
+ <!-- ===================== CHOOSE ANOTHER BUILDING ON
PROPERTY ================= -->
<div id="choose-building" class="select-box">
<xsl:if test="location_level > 1">
<a>
Modified: trunk/controller/templates/base/check_list/print_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/print_check_list.xsl
2012-06-02 18:38:11 UTC (rev 9484)
+++ trunk/controller/templates/base/check_list/print_check_list.xsl
2012-06-04 08:39:52 UTC (rev 9485)
@@ -69,6 +69,6 @@
}
</style>
-<a style="margin:20px 0 0 40px;" href="#print" class="btn"
onClick="window.print()">Skriv ut</a>
+<a id="exec_print" href="#print" class="btn" onClick="window.print()">Skriv
ut</a>
</xsl:template>
Modified:
trunk/controller/templates/base/check_list/view_cases_for_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_cases_for_check_list.xsl
2012-06-02 18:38:11 UTC (rev 9484)
+++ trunk/controller/templates/base/check_list/view_cases_for_check_list.xsl
2012-06-04 08:39:52 UTC (rev 9485)
@@ -62,7 +62,7 @@
<xsl:with-param
name="active_tab">view_cases</xsl:with-param>
</xsl:call-template>
- <a style="display:none;" id="view_open_cases">
+ <a id="view_open_cases">
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicheck_list.view_open_cases</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
Modified: trunk/controller/templates/base/check_list/view_check_lists.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_check_lists.xsl
2012-06-02 18:38:11 UTC (rev 9484)
+++ trunk/controller/templates/base/check_list/view_check_lists.xsl
2012-06-04 08:39:52 UTC (rev 9485)
@@ -85,7 +85,7 @@
<xsl:text>&control_id=</xsl:text>
<xsl:value-of
select="control_as_array/id"/>
</xsl:attribute>
- <div style="margin-top:30px">
+ <div>
Se kalenderoversikt for kontroll
</div>
</a>
Modified: trunk/controller/templates/base/check_list/view_control_items.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_control_items.xsl
2012-06-02 18:38:11 UTC (rev 9484)
+++ trunk/controller/templates/base/check_list/view_control_items.xsl
2012-06-04 08:39:52 UTC (rev 9485)
@@ -35,7 +35,7 @@
</xsl:for-each>
</ul>
-<a style="margin-top:20px;" id="print_control_items" class="btn"
target="_blank">
+<a id="print_control_items" class="btn" target="_blank">
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicheck_list.print_check_list</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
Modified: trunk/controller/templates/base/check_list/view_open_cases.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_open_cases.xsl
2012-06-02 18:38:11 UTC (rev 9484)
+++ trunk/controller/templates/base/check_list/view_open_cases.xsl
2012-06-04 08:39:52 UTC (rev 9485)
@@ -21,7 +21,7 @@
<li class="check_item_case">
<h4><span><xsl:value-of select="control_item/title"/></span></h4>
- <span
style="display:none;" class="control_item_type"><xsl:value-of
select="control_item/type" /></span>
+ <span
class="control_item_type ext_info"><xsl:value-of select="control_item/type"
/></span>
<ul>
<xsl:for-each select="cases_array">
@@ -34,7 +34,7 @@
</div>
<!-- ==================== COL2: CASE CONTENT ===================== -->
<div class="col_2">
-
<form style="display:none;" class="frm_update_case">
+
<form 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>
@@ -114,7 +114,7 @@
<xsl:when test="control_item/type = 'control_item_type_2'">
<h2>Målinger</h2>
<h4><span><xsl:value-of select="control_item/title"/></span></h4>
-
<span style="display:none;" class="control_item_type"><xsl:value-of
select="control_item/type" /></span>
+
<span class="control_item_type ext_info"><xsl:value-of
select="control_item/type" /></span>
<ul>
<xsl:for-each select="cases_array">
<xsl:variable name="cases_id"><xsl:value-of
select="id"/></xsl:variable>
@@ -186,7 +186,7 @@
</div>
</div>
<!-- =================== UPDATE CASE FORM
=================== -->
-
<form style="display:none;" class="frm_update_case">
+
<form 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>
@@ -224,7 +224,7 @@
</input>
</div>
<!-- DESCRIPTION -->
-
<label style="font-weight:
bold;">Beskrivelse:</label>
+
<label>Beskrivelse:</label>
<div class="row">
<textarea
name="case_descr"><xsl:value-of select="descr"/></textarea>
</div>
@@ -259,7 +259,7 @@
<xsl:when test="control_item/type = 'control_item_type_3' or control_item/type
= 'control_item_type_4'">
<h2>Målinger</h2>
<h4><span><xsl:value-of select="control_item/title"/></span></h4>
-
<span style="display:none;" class="control_item_type"><xsl:value-of
select="control_item/type" /></span>
+
<span class="control_item_type ext_info"><xsl:value-of
select="control_item/type" /></span>
<ul>
<xsl:for-each select="cases_array">
<xsl:variable name="cases_id"><xsl:value-of
select="id"/></xsl:variable>
@@ -331,7 +331,7 @@
</div>
</div>
<!-- =================== UPDATE CASE FORM
=================== -->
-
<form style="display:none;" class="frm_update_case">
+
<form 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>
@@ -374,7 +374,7 @@
</select>
</div>
<!-- DESCRIPTION -->
-
<label style="font-weight:
bold;">Beskrivelse:</label>
+
<label>Beskrivelse:</label>
<div class="row">
<textarea
name="case_descr"><xsl:value-of select="descr"/></textarea>
</div>
Modified: trunk/controller/templates/base/control/control.xsl
===================================================================
--- trunk/controller/templates/base/control/control.xsl 2012-06-02 18:38:11 UTC
(rev 9484)
+++ trunk/controller/templates/base/control/control.xsl 2012-06-04 08:39:52 UTC
(rev 9485)
@@ -158,7 +158,7 @@
<dd>
<xsl:choose>
<xsl:when test="editable">
- <input class="required"
style="width:20px;" size="2" type="text" name="repeat_interval"
value="{control/repeat_interval}" />
+ <input class="required"
id="repeat_interval" size="2" type="text" name="repeat_interval"
value="{control/repeat_interval}" />
<span class="help_text">Angi
hvilket frekvensintervall kontrollen skal ha. Hvis du velger 2, betyr det at
kontrollen skal gjennomføres annenhver dag</span>
</xsl:when>
<xsl:otherwise>
Modified:
trunk/controller/templates/base/control_item/view_control_item_list.xsl
===================================================================
--- trunk/controller/templates/base/control_item/view_control_item_list.xsl
2012-06-02 18:38:11 UTC (rev 9484)
+++ trunk/controller/templates/base/control_item/view_control_item_list.xsl
2012-06-04 08:39:52 UTC (rev 9485)
@@ -48,8 +48,8 @@
</li>
</xsl:for-each>
</ul>
- <div style="margin:20px 0;">
- <a
style="text-decoration:underline;font-size:20px;color:#333;">
+ <div>
+ <a>
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicheck_list.save_check_list</xsl:text>
<xsl:text>&control_id=</xsl:text>
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-02 18:38:11 UTC (rev 9484)
+++
trunk/controller/templates/base/control_location/register_control_to_location.xsl
2012-06-04 08:39:52 UTC (rev 9485)
@@ -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>
- <select style="float:left;" id="control_area_list"
name="control_area_id">
+ <select id="control_area_list" name="control_area_id">
<option value="">Velg kontrollområde</option>
<xsl:for-each select="control_areas_array">
<option value="{id}">
@@ -154,7 +154,7 @@
<xsl:template match="datatable" xmlns:php="http://php.net/xsl";>
<div id="data_paginator"/>
- <div class="error_msg" style="margin-left:20px;">Du må velge bygg før
du kan legge til en kontroll</div>
+ <div class="error_msg">Du må velge bygg før du kan legge til en
kontroll</div>
<div id="datatable-container"/>
<xsl:call-template name="datasource-definition" />
Modified:
trunk/controller/templates/base/control_location/view_locations_for_control.xsl
===================================================================
---
trunk/controller/templates/base/control_location/view_locations_for_control.xsl
2012-06-02 18:38:11 UTC (rev 9484)
+++
trunk/controller/templates/base/control_location/view_locations_for_control.xsl
2012-06-04 08:39:52 UTC (rev 9485)
@@ -29,7 +29,7 @@
The operation fetches controls from db
and populates the control list.
The ajax operation is handled in
ajax.js
-->
- <select style="float:left;"
id="control_area_list" name="control_area_list">
+ <select id="control_area_list"
name="control_area_list">
<option value="">Velg
kontrollområde</option>
<xsl:for-each
select="control_areas_array">
<option value="{id}">
@@ -71,7 +71,7 @@
</ul>
</div>
- <iframe id="yui-history-iframe"
src="phpgwapi/js/yahoo/history/assets/blank.html"
style="position:absolute;top:0; left:0;width:1px;
height:1px;visibility:hidden;"></iframe>
+ <iframe id="yui-history-iframe"
src="phpgwapi/js/yahoo/history/assets/blank.html"></iframe>
<input id="yui-history-field" type="hidden"/>
<xsl:apply-templates select="locations_table"/>
@@ -84,7 +84,7 @@
<xsl:template match="locations_table" xmlns:php="http://php.net/xsl";>
<div id="loc_paginator"/>
- <div style="margin:20px;" id="locations-container"/>
+ <div id="locations-container"/>
<xsl:call-template name="locations-definition" />
</xsl:template>
Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css 2012-06-02 18:38:11 UTC
(rev 9484)
+++ trunk/controller/templates/base/css/base.css 2012-06-04 08:39:52 UTC
(rev 9485)
@@ -1201,6 +1201,10 @@
text-decoration: none;
}
+.ext_info{
+ display:none;
+}
+
.info_box_wrp {
background: url("../../../images/status_icon_red_empty.png") no-repeat
scroll 50% 50% transparent;
height: 15px;
@@ -1561,7 +1565,9 @@
}
/* ================================ FORM UPDATE CASE
============================= */
-
+.frm_update_case{
+ display: none;
+}
.frm_update_case label {
display: block;
}
@@ -1675,7 +1681,7 @@
border: 1px solid #ABABAB;
}
-/* ===================== REGISTER CONTROL FOR LOCATION =====================
*/
+/* ===================== CONTROL LOCATION ===================== */
#choose_control{
margin: 10px;
@@ -1689,6 +1695,18 @@
padding: 7px 0;
}
+#control_area_list {
+ float:left;
+}
+
+#data_paginator .error_msg{
+ margin-left:20px;
+}
+
+#locations-container{
+ margin:20px;
+}
+
/* ========================== CONTROL DETAILS ============================
*/
#control_details label {
@@ -1713,6 +1731,10 @@
vertical-align: baseline;
}
+#repeat_interval{
+ width: 20px;
+}
+
/* ============================= CONTROL GROUP AND ITEMS
======================= */
#control_group_tabview .yui-content{
padding: 10px;
@@ -1756,6 +1778,10 @@
margin-bottom: 10px;
}
+#search-location-name {
+ width: 16em;
+}
+
#choose-my-location {
float: right;
margin-right: 10px;
@@ -1765,6 +1791,11 @@
float: left;
}
+.month_view #choose-building {
+ clear:left;
+ margin-top: 1em;
+}
+
.select-box {
background: none repeat scroll 0 0 #FEFBF4;
border: 1px solid #DDDDDD;
@@ -1794,3 +1825,19 @@
background: #3F7EC1;
}
+#print_control_items{
+ margin-top:20px;
+}
+
+#exec_print {
+ margin:20px 0 0 40px;
+}
+
+#yui-history-iframe {
+ position:absolute;
+ top:0;
+ left:0;
+ width:1px;
+ height:1px;
+ visibility:hidden;
+}
\ No newline at end of file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9485],
Torstein <=