[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9491]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [9491] |
|
Date: |
Mon, 04 Jun 2012 13:11:48 +0000 |
Revision: 9491
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9491
Author: vator
Date: 2012-06-04 13:11:48 +0000 (Mon, 04 Jun 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/templates/base/add_component_to_control.xsl
trunk/controller/templates/base/add_component_to_control_group.xsl
trunk/controller/templates/base/calendar/view_calendar_month.xsl
trunk/controller/templates/base/calendar/view_calendar_year.xsl
trunk/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
trunk/controller/templates/base/check_list/print_check_list.xsl
trunk/controller/templates/base/check_list/view_control_items.xsl
trunk/controller/templates/base/component.xsl
trunk/controller/templates/base/control_group/control_group_items.xsl
trunk/controller/templates/base/control_item/control_item.xsl
trunk/controller/templates/base/view_component_for_control.xsl
Modified: trunk/controller/templates/base/add_component_to_control.xsl
===================================================================
--- trunk/controller/templates/base/add_component_to_control.xsl
2012-06-04 13:11:35 UTC (rev 9490)
+++ trunk/controller/templates/base/add_component_to_control.xsl
2012-06-04 13:11:48 UTC (rev 9491)
@@ -33,8 +33,7 @@
</xsl:template>
<xsl:template match="control_filters" name="control_filters"
xmlns:php="http://php.net/xsl";>
- <div style="margin: 10px;padding: 10px; width: 25%;">
-
+ <div id="select-wrp">
<!-- When control area is chosen, an ajax request is executed.
The operation fetches controls from db and populates the control list.
The ajax opearation is handled in ajax.js -->
<select id="control_area_list" name="control_area_list">
Modified: trunk/controller/templates/base/add_component_to_control_group.xsl
===================================================================
--- trunk/controller/templates/base/add_component_to_control_group.xsl
2012-06-04 13:11:35 UTC (rev 9490)
+++ trunk/controller/templates/base/add_component_to_control_group.xsl
2012-06-04 13:11:48 UTC (rev 9491)
@@ -33,7 +33,7 @@
</xsl:template>
<xsl:template match="control_group_filters" name="control_group_filters"
xmlns:php="http://php.net/xsl";>
- <div style="margin: 10px;padding: 10px; width: 25%;">
+ <div id="select-wrp">
<!-- When control area is chosen, an ajax request is executed.
The operation fetches control groups from db and populates the control group
list.
The ajax opearation is handled in ajax.js -->
Modified: trunk/controller/templates/base/calendar/view_calendar_month.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_month.xsl
2012-06-04 13:11:35 UTC (rev 9490)
+++ trunk/controller/templates/base/calendar/view_calendar_month.xsl
2012-06-04 13:11:48 UTC (rev 9491)
@@ -77,7 +77,7 @@
<!-- ===================== SEARCH FOR LOCATION
================= -->
<div id="search-location" class="select-box">
- <div id="choose_loc">
+ <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>
@@ -211,28 +211,8 @@
</xsl:otherwise>
</xsl:choose>
</div>
- <!--
- <select id="loc_1" class="choose_loc">
- <xsl:for-each select="property_array">
- <xsl:variable
name="loc_code"><xsl:value-of select="location_code"/></xsl:variable>
- <xsl:choose>
- <xsl:when
test="location_code = $view_location_code">
- <option
value="{$loc_code}" selected="selected">
-
<xsl:value-of disable-output-escaping="yes" select="loc1_name"/>
- </option>
- </xsl:when>
- <xsl:otherwise>
- <option
value="{$loc_code}">
-
<xsl:value-of disable-output-escaping="yes" select="loc1_name"/>
- </option>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
- </select>
- -->
</div>
-
-
+
<div id="cal_wrp">
<table id="calendar" class="month">
<tr class="heading">
Modified: trunk/controller/templates/base/calendar/view_calendar_year.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-06-04 13:11:35 UTC (rev 9490)
+++ trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-06-04 13:11:48 UTC (rev 9491)
@@ -76,7 +76,7 @@
<!-- ===================== SEARCH FOR LOCATION
================= -->
<div id="search-location" class="select-box">
- <div id="choose_loc">
+ <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>
@@ -117,25 +117,6 @@
<xsl:call-template
name="select_buildings_on_property" />
</div>
- <!--
- <select id="loc_1" class="choose_loc">
- <xsl:for-each select="property_array">
- <xsl:variable
name="loc_code"><xsl:value-of select="location_code"/></xsl:variable>
- <xsl:choose>
- <xsl:when
test="location_code = current_location/location_code">
- <option
value="{$loc_code}" selected="selected">
-
<xsl:value-of disable-output-escaping="yes" select="loc1_name"/>
- </option>
- </xsl:when>
- <xsl:otherwise>
- <option
value="{$loc_code}">
-
<xsl:value-of disable-output-escaping="yes" select="loc1_name"/>
- </option>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
- </select>
- -->
<!-- ===================== COLOR ICON MAP
================= -->
<xsl:call-template name="icon_color_map" />
@@ -172,7 +153,7 @@
</div>
<div id="cal_wrp">
- <table id="calendar">
+ <table id="calendar" class="year">
<tr class="heading">
<th
class="title"><span>Tittel</span></th>
<th
class="assigned"><span>Tildelt</span></th>
Modified:
trunk/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
===================================================================
---
trunk/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
2012-06-04 13:11:35 UTC (rev 9490)
+++
trunk/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
2012-06-04 13:11:48 UTC (rev 9491)
@@ -20,7 +20,7 @@
</div>
<div id="cal_wrp">
- <table id="calendar">
+ <table id="calendar" class="year">
<tr>
<th>
<span
class="location_code">Lokasjonskode</span>
Modified: trunk/controller/templates/base/check_list/print_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/print_check_list.xsl
2012-06-04 13:11:35 UTC (rev 9490)
+++ trunk/controller/templates/base/check_list/print_check_list.xsl
2012-06-04 13:11:48 UTC (rev 9491)
@@ -69,6 +69,6 @@
}
</style>
-<a id="exec_print" 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_control_items.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_control_items.xsl
2012-06-04 13:11:35 UTC (rev 9490)
+++ trunk/controller/templates/base/check_list/view_control_items.xsl
2012-06-04 13:11:48 UTC (rev 9491)
@@ -35,7 +35,7 @@
</xsl:for-each>
</ul>
-<a 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/component.xsl
===================================================================
--- trunk/controller/templates/base/component.xsl 2012-06-04 13:11:35 UTC
(rev 9490)
+++ trunk/controller/templates/base/component.xsl 2012-06-04 13:11:48 UTC
(rev 9491)
@@ -44,7 +44,7 @@
</xsl:template>
<xsl:template match="form">
- <form id="queryForm" style="margin: 20px; width: 65%;">
+ <form id="queryForm">
<xsl:attribute name="method">
<xsl:value-of select="phpgw:conditional(not(method),
'GET', method)"/>
</xsl:attribute>
@@ -63,7 +63,7 @@
<xsl:template match="toolbar">
<div id="toolbar">
- <table class='yui-skin-sam' border="0" cellspacing="0"
cellpadding="0" style="padding:0px; margin:0px;">
+ <table class='yui-skin-sam'>
<tr>
<xsl:for-each select="item">
<xsl:variable name="filter_key"
select="concat('filter_', name)"/>
Modified: trunk/controller/templates/base/control_group/control_group_items.xsl
===================================================================
--- trunk/controller/templates/base/control_group/control_group_items.xsl
2012-06-04 13:11:35 UTC (rev 9490)
+++ trunk/controller/templates/base/control_group/control_group_items.xsl
2012-06-04 13:11:48 UTC (rev 9491)
@@ -15,10 +15,8 @@
</xsl:for-each>
</ul>
<xsl:if test="//editable">
- <div class="form-buttons">
<xsl:variable
name="lang_remove"><xsl:value-of select="php:function('lang', 'remove')"
/></xsl:variable>
<input type="submit"
name="remove_control_group_items" value="{$lang_remove}" title =
"{$lang_remove}" />
- </div>
</xsl:if>
</form>
</xsl:if>
@@ -37,10 +35,8 @@
<li><input type="checkbox"
name="control_tag_ids[]" value="{$control_item_id}" /><xsl:value-of
select="title"/></li>
</xsl:for-each>
</ul>
- <div class="form-buttons">
<xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'save')" /></xsl:variable>
<input type="submit"
name="save_control_group_items" value="{$lang_save}" title = "{$lang_save}" />
- </div>
</form>
</xsl:when>
</xsl:choose>
Modified: trunk/controller/templates/base/control_item/control_item.xsl
===================================================================
--- trunk/controller/templates/base/control_item/control_item.xsl
2012-06-04 13:11:35 UTC (rev 9490)
+++ trunk/controller/templates/base/control_item/control_item.xsl
2012-06-04 13:11:48 UTC (rev 9491)
@@ -7,7 +7,14 @@
<div id="main_content">
-<h1><xsl:value-of select="php:function('lang', 'Register control item')"
/></h1>
+<xsl:choose>
+ <xsl:when test="editable">
+ <h1><xsl:value-of select="php:function('lang', 'Register
control item')" /></h1>
+ </xsl:when>
+ <xsl:otherwise>
+ <h1><xsl:value-of select="php:function('lang', 'View control
item')" /></h1>
+ </xsl:otherwise>
+</xsl:choose>
<ul class="check_list">
<xsl:for-each select="check_list_array">
Modified: trunk/controller/templates/base/view_component_for_control.xsl
===================================================================
--- trunk/controller/templates/base/view_component_for_control.xsl
2012-06-04 13:11:35 UTC (rev 9490)
+++ trunk/controller/templates/base/view_component_for_control.xsl
2012-06-04 13:11:48 UTC (rev 9491)
@@ -22,7 +22,8 @@
<div class="yui-content">
<div id="control_details">
- <div style="margin: 10px;padding: 10px; width: 25%;">
+
+ <div id="select-wrp">
<!-- When control area is chosen, an ajax
request is executed.
The operation fetches controls from db
and populates the control list.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9491],
Torstein <=