|
| From: | Torstein |
| Subject: | [Fmsystem-commits] [9103] |
| Date: | Wed, 04 Apr 2012 09:23:01 +0000 |
Revision: 9103
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9103
Author: vator
Date: 2012-04-04 09:23:01 +0000 (Wed, 04 Apr 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/setup/phpgw_no.lang
trunk/controller/templates/base/calendar/view_calendar_year.xsl
trunk/controller/templates/base/case/create_case_message.xsl
trunk/controller/templates/base/case/view_case_message.xsl
trunk/controller/templates/base/check_list/add_check_list.xsl
trunk/controller/templates/base/check_list/edit_check_list.xsl
trunk/controller/templates/base/check_list/register_case.xsl
trunk/controller/templates/base/check_list/view_cases_for_check_list.xsl
trunk/controller/templates/base/check_list/view_check_list.xsl
trunk/controller/templates/base/check_list/view_check_lists.xsl
trunk/controller/templates/base/check_list/view_closed_cases.xsl
trunk/controller/templates/base/check_list/view_control_info.xsl
trunk/controller/templates/base/check_list/view_open_cases.xsl
trunk/controller/templates/base/css/base.css
Modified: trunk/controller/setup/phpgw_no.lang
===================================================================
--- trunk/controller/setup/phpgw_no.lang 2012-04-04 09:22:41 UTC (rev
9102)
+++ trunk/controller/setup/phpgw_no.lang 2012-04-04 09:23:01 UTC (rev
9103)
@@ -291,7 +291,7 @@
start_date controller no Start dato
planned_date controller no Planlagt dato
end_date controller no Slutt dato
-View_locations_for_control controller no Vis knytning mot
lokasjon
+View_locations_for_control controller no Vis kontroller for
lokasjon
Add_locations_for_control controller no Legg til knytning mot
lokasjon
View_component_for_control controller no Vis knytning mot utstyr
Add_component_for_control controller no Legg til knytning mot
utstyr
Modified: trunk/controller/templates/base/calendar/view_calendar_year.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-04-04 09:22:41 UTC (rev 9102)
+++ trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-04-04 09:23:01 UTC (rev 9103)
@@ -214,7 +214,18 @@
</xsl:when>
<xsl:when test="status = 'control_not_accomplished'">
<div>
-
<img height="12" src="controller/images/status_icon_red_cross.png" />
+
<a>
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.add_check_list</xsl:text>
+
<xsl:text>&date=</xsl:text>
+
<xsl:value-of select="info/date"/>
+
<xsl:text>&control_id=</xsl:text>
+
<xsl:value-of select="info/control_id"/>
+
<xsl:text>&location_code=</xsl:text>
+
<xsl:value-of select="$view_location_code"/>
+
</xsl:attribute>
+
<img height="12"
src="controller/images/status_icon_red_cross.png" />
+
</a>
</div>
</xsl:when>
<xsl:otherwise>
Modified: trunk/controller/templates/base/case/create_case_message.xsl
===================================================================
--- trunk/controller/templates/base/case/create_case_message.xsl
2012-04-04 09:22:41 UTC (rev 9102)
+++ trunk/controller/templates/base/case/create_case_message.xsl
2012-04-04 09:23:01 UTC (rev 9103)
@@ -2,7 +2,7 @@
<xsl:template match="data" name="view_check_list"
xmlns:php="http://php.net/xsl";>
<xsl:variable name="date_format">d/m-Y</xsl:variable>
-<div id="main_content">
+<div id="main_content" class="medium">
<h1>Utførelse av kontroll: <xsl:value-of
select="control/title"/></h1>
<h2>Sjekkliste for: <xsl:value-of
select="location_array/loc1_name"/></h2>
Modified: trunk/controller/templates/base/case/view_case_message.xsl
===================================================================
--- trunk/controller/templates/base/case/view_case_message.xsl 2012-04-04
09:22:41 UTC (rev 9102)
+++ trunk/controller/templates/base/case/view_case_message.xsl 2012-04-04
09:23:01 UTC (rev 9103)
@@ -2,7 +2,7 @@
<xsl:template match="data" name="view_check_list"
xmlns:php="http://php.net/xsl";>
<xsl:variable name="date_format">d/m-Y</xsl:variable>
-<div id="main_content">
+<div id="main_content" class="medium">
<h1>Melding registrert</h1>
Modified: trunk/controller/templates/base/check_list/add_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/add_check_list.xsl
2012-04-04 09:22:41 UTC (rev 9102)
+++ trunk/controller/templates/base/check_list/add_check_list.xsl
2012-04-04 09:23:01 UTC (rev 9103)
@@ -23,7 +23,7 @@
</script>
-<div id="main_content">
+<div id="main_content" class="medium">
<h1>Registrere sjekkliste for <xsl:value-of
select="location_array/loc1_name"/></h1>
@@ -68,7 +68,7 @@
</div>
<div>
<label>Fristdato</label>
- <input>
+ <input class="date">
<xsl:attribute
name="id">deadline_date</xsl:attribute>
<xsl:attribute
name="name">deadline_date</xsl:attribute>
<xsl:attribute
name="type">text</xsl:attribute>
@@ -77,7 +77,7 @@
</div>
<div>
<label>Planlagt dato</label>
- <input>
+ <input class="date">
<xsl:attribute
name="id">planned_date</xsl:attribute>
<xsl:attribute
name="name">planned_date</xsl:attribute>
<xsl:attribute
name="type">text</xsl:attribute>
@@ -86,7 +86,7 @@
</div>
<div>
<label>Utført dato</label>
- <input>
+ <input class="date">
<xsl:attribute
name="id">completed_date</xsl:attribute>
<xsl:attribute
name="name">completed_date</xsl:attribute>
<xsl:attribute
name="type">text</xsl:attribute>
@@ -95,7 +95,9 @@
</xsl:if>
</input>
</div>
- <div><label>Utstyr</label><input
name="equipment_id" /></div>
+ <!--
+ div><label>Utstyr</label><input
name="equipment_id" /></div>
+ -->
<div>
<label class="comment">Kommentar</label>
<textarea>
Modified: trunk/controller/templates/base/check_list/edit_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/edit_check_list.xsl
2012-04-04 09:22:41 UTC (rev 9102)
+++ trunk/controller/templates/base/check_list/edit_check_list.xsl
2012-04-04 09:23:01 UTC (rev 9103)
@@ -2,7 +2,7 @@
<xsl:template match="data" name="view_check_list"
xmlns:php="http://php.net/xsl";>
<xsl:variable name="date_format">d/m-Y</xsl:variable>
-<div id="main_content">
+<div id="main_content" class="medium">
<script>
$(function() {
@@ -47,7 +47,7 @@
<div>
<label>ID</label>
- <input>
+ <input class="id" disabled="disabled">
<xsl:attribute
name="name">check_list_id</xsl:attribute>
<xsl:attribute name="value"><xsl:value-of
select="check_list/id"/></xsl:attribute>
</input>
@@ -78,7 +78,7 @@
</div>
<div>
<label>Skal utføres innen</label>
- <input>
+ <input class="date">
<xsl:attribute
name="id">deadline_date</xsl:attribute>
<xsl:attribute
name="name">deadline_date</xsl:attribute>
<xsl:attribute name="type">text</xsl:attribute>
@@ -89,7 +89,7 @@
</div>
<div>
<label>Planlagt dato</label>
- <input>
+ <input class="date">
<xsl:attribute
name="id">planned_date</xsl:attribute>
<xsl:attribute
name="name">planned_date</xsl:attribute>
<xsl:attribute name="type">text</xsl:attribute>
@@ -100,7 +100,7 @@
</div>
<div>
<label>Utført dato</label>
- <input>
+ <input class="date">
<xsl:attribute
name="id">completed_date</xsl:attribute>
<xsl:attribute
name="name">completed_date</xsl:attribute>
<xsl:attribute name="type">text</xsl:attribute>
Modified: trunk/controller/templates/base/check_list/register_case.xsl
===================================================================
--- trunk/controller/templates/base/check_list/register_case.xsl
2012-04-04 09:22:41 UTC (rev 9102)
+++ trunk/controller/templates/base/check_list/register_case.xsl
2012-04-04 09:23:01 UTC (rev 9103)
@@ -2,7 +2,7 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-<div id="main_content">
+<div id="main_content" class="medium">
<h1>Utførelse av kontroll: <xsl:value-of select="control/title"/></h1>
<h2>Sjekkliste for: <xsl:value-of
select="location_array/loc1_name"/></h2>
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-04-04 09:22:41 UTC (rev 9102)
+++ trunk/controller/templates/base/check_list/view_cases_for_check_list.xsl
2012-04-04 09:23:01 UTC (rev 9103)
@@ -2,7 +2,7 @@
<xsl:template match="data" name="view_check_list"
xmlns:php="http://php.net/xsl";>
<xsl:variable name="date_format">d/m-Y</xsl:variable>
-<div id="main_content">
+<div id="main_content" class="medium">
<script>
Modified: trunk/controller/templates/base/check_list/view_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_check_list.xsl
2012-04-04 09:22:41 UTC (rev 9102)
+++ trunk/controller/templates/base/check_list/view_check_list.xsl
2012-04-04 09:23:01 UTC (rev 9103)
@@ -2,7 +2,7 @@
<xsl:template match="data" name="view_check_list"
xmlns:php="http://php.net/xsl";>
<xsl:variable name="date_format">d/m-Y</xsl:variable>
-<div id="main_content">
+<div id="main_content" class="medium">
<!-- =========================== SHOWS CONTROL ITEMS RECEIPT
=============================== -->
Modified: trunk/controller/templates/base/check_list/view_check_lists.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_check_lists.xsl
2012-04-04 09:22:41 UTC (rev 9102)
+++ trunk/controller/templates/base/check_list/view_check_lists.xsl
2012-04-04 09:23:01 UTC (rev 9103)
@@ -2,7 +2,7 @@
<xsl:template match="data" name="view_check_lists"
xmlns:php="http://php.net/xsl";>
<xsl:variable name="date_format">d/m-Y</xsl:variable>
-<div id="main_content">
+<div id="main_content" class="medium">
<!-- =========================== SHOWS CONTROL ITEMS RECEIPT
=============================== -->
<xsl:variable name="control_id"><xsl:value-of
select="control_id"/></xsl:variable>
Modified: trunk/controller/templates/base/check_list/view_closed_cases.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_closed_cases.xsl
2012-04-04 09:22:41 UTC (rev 9102)
+++ trunk/controller/templates/base/check_list/view_closed_cases.xsl
2012-04-04 09:23:01 UTC (rev 9103)
@@ -36,7 +36,7 @@
</div>
</xsl:when>
<xsl:otherwise>
-
<div style="float:right;"><span style="color:red">Ingen
melding registrert</span></div>
+
<div class="message closed">Ingen melding</div>
</xsl:otherwise>
</xsl:choose>
</li>
Modified: trunk/controller/templates/base/check_list/view_control_info.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_control_info.xsl
2012-04-04 09:22:41 UTC (rev 9102)
+++ trunk/controller/templates/base/check_list/view_control_info.xsl
2012-04-04 09:23:01 UTC (rev 9103)
@@ -2,7 +2,7 @@
<xsl:template match="data" name="view_check_list"
xmlns:php="http://php.net/xsl";>
<xsl:variable name="date_format">d/m-Y</xsl:variable>
-<div id="main_content">
+<div id="main_content" class="medium">
<script>
$(document).ready(function() {
Modified: trunk/controller/templates/base/check_list/view_open_cases.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_open_cases.xsl
2012-04-04 09:22:41 UTC (rev 9102)
+++ trunk/controller/templates/base/check_list/view_open_cases.xsl
2012-04-04 09:23:01 UTC (rev 9103)
@@ -19,76 +19,142 @@
<xsl:when
test="cases_array/child::node()">
<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>
<ul>
<xsl:for-each select="cases_array">
<xsl:variable name="cases_id"><xsl:value-of select="id"/></xsl:variable>
-
<li><span class="order_nr"><xsl:number /></span>. <xsl:value-of select="descr"/>
-
Status:
-
<xsl:choose>
-
<xsl:when test="status = 1">Utført</xsl:when>
-
<xsl:when test="status = 2">Venter på tilbakemelding</xsl:when>
-
</xsl:choose>
-
<div class="quick_menu">
-
<a class="quick_edit">
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicase.save_case</xsl:text>
-
<xsl:text>&case_id=</xsl:text>
-
<xsl:value-of select="id"/>
-
<xsl:text>&check_list_id=</xsl:text>
-
<xsl:value-of select="//check_list/id"/>
-
<xsl:text>&phpgw_return_as=json</xsl:text>
-
</xsl:attribute>
-
endre
-
</a>
-
<a class="close_case">
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicase.close_case</xsl:text>
-
<xsl:text>&case_id=</xsl:text>
-
<xsl:value-of select="id"/>
-
<xsl:text>&check_list_id=</xsl:text>
-
<xsl:value-of select="//check_list/id"/>
-
<xsl:text>&phpgw_return_as=json</xsl:text>
-
</xsl:attribute>
-
lukk
-
</a>
+
<li>
+
+
<!-- ==================== COL1: ORDERNR ===================== -->
+
<div class="col_1">
+
<span class="order_nr"><xsl:number /></span>.
+
</div>
+
+
<!-- ==================== COL2: CASE CONTENT ===================== -->
+
<div class="col_2">
+
<!-- === FORM: UPDATE CASE === -->
+
<form style="display:none;" 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>
+
<xsl:value-of select="id"/>
+
<xsl:text>&check_list_id=</xsl:text>
+
<xsl:value-of select="//check_list/id"/>
+
<xsl:text>&phpgw_return_as=json</xsl:text>
+
</xsl:attribute>
+
+
<!-- STATUS -->
+
<div class="row first">
+
<label>Status:</label>
+
<select name="status">
+
<xsl:choose>
+
<xsl:when test="status = 0">
+
<option value="0"
SELECTED="SELECTED">Åpen</option>
+
<option value="2">Venter på
tilbakemelding</option>
+
</xsl:when>
+
<xsl:when test="status = 1">
+
<option value="0">Åpen</option>
+
<option value="2">Venter på
tilbakemelding</option>
+
</xsl:when>
+
<xsl:when test="status = 2">
+
<option value="0">Åpen</option>
+
<option value="2"
SELECTED="SELECTED">Venter på tilbakemelding</option>
+
</xsl:when>
+
</xsl:choose>
+
</select>
+
</div>
+
<!-- MEASUREMENT -->
+
<div class="row">
+
<label>Måleverdi:</label>
+
<input type="text" name="measurement">
+
<xsl:attribute name="value"><xsl:value-of
select="measurement"/></xsl:attribute>
+
</input>
+
</div>
+
<!-- DESCRIPTION -->
+
<label style="font-weight: bold;">Beskrivelse:</label>
+
<div class="row">
+
<textarea name="case_descr"><xsl:value-of
select="descr"/></textarea>
+
</div>
+
<div>
+
<input class='btn_m' type='submit' value='Oppdater' /><input
class='btn_m cancel' type='button' value='Avbryt' />
+
</div>
+
</form>
+
+
<!-- === CASE INFO === -->
+
<div class="case_info">
+
<!-- STATUS -->
+
<div class="row first">
+
<label style="font-weight:bold; margin-right:
5px;">Status:</label>
<xsl:choose>
-
<xsl:when test="location_item_id = 0">
-
<a class="delete_case">
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicase.delete_case</xsl:text>
-
<xsl:text>&case_id=</xsl:text>
-
<xsl:value-of select="id"/>
-
<xsl:text>&check_list_id=</xsl:text>
-
<xsl:value-of
select="//check_list/id"/>
-
<xsl:text>&phpgw_return_as=json</xsl:text>
-
</xsl:attribute>
-
slett
-
</a>
-
</xsl:when>
+
<xsl:when test="status = 0">Åpen</xsl:when>
+
<xsl:when test="status = 1">Lukket</xsl:when>
+
<xsl:when test="status = 2">Venter på
tilbakemelding</xsl:when>
</xsl:choose>
-
<xsl:choose>
-
<xsl:when test="location_item_id > 0">
-
<a target="_blank">
+
</div>
+
<!-- MEASUREMENT -->
+
<div class="row">
+
<label style="font-weight:bold; margin-right:
5px;">Måleverdi:</label>
+
<span class="measurement"><xsl:value-of
select="measurement"/></span>
+
</div>
+
<!-- DESCRIPTION -->
+
<div class="row">
+
<label style="font-weight:bold">Beskrivelse:</label>
+
</div>
+
<div class="case_descr"><xsl:value-of select="descr"/></div>
+
+
<!-- === QUICK EDIT MENU === -->
+
<div class="quick_menu">
+
<a class="quick_edit" href="">
+
endre
+
</a>
+
<a class="close_case">
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicase.close_case</xsl:text>
+
<xsl:text>&case_id=</xsl:text>
+
<xsl:value-of select="id"/>
+
<xsl:text>&check_list_id=</xsl:text>
+
<xsl:value-of select="//check_list/id"/>
+
<xsl:text>&phpgw_return_as=json</xsl:text>
+
</xsl:attribute>
+
lukk
+
</a>
+
<xsl:choose>
+
<xsl:when test="location_item_id = 0">
+
<a class="delete_case">
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=property.uitts.view</xsl:text>
-
<xsl:text>&id=</xsl:text>
-
<xsl:value-of
select="location_item_id"/>
+
<xsl:text>index.php?menuaction=controller.uicase.delete_case</xsl:text>
+
<xsl:text>&case_id=</xsl:text>
+
<xsl:value-of
select="id"/>
+
<xsl:text>&check_list_id=</xsl:text>
+
<xsl:value-of
select="//check_list/id"/>
+
<xsl:text>&phpgw_return_as=json</xsl:text>
</xsl:attribute>
-
Vis melding
+
slett
</a>
-
</xsl:when>
-
<xsl:otherwise>
-
<span class="message">Ingen melding</span>
-
</xsl:otherwise>
-
</xsl:choose>
+
</xsl:when>
+
</xsl:choose>
+
</div>
</div>
-
<div style="display:none;" class="case_info">
-
<div class="case_id"><xsl:value-of select="id"/></div>
-
<div class="case_descr"><xsl:value-of select="descr"/></div>
-
<div class="case_status"><xsl:value-of select="status"/></div>
-
<div class="case_measurement"><xsl:value-of
select="measurement"/></div>
-
<div class="case_type"><xsl:value-of
select="control_item/type"/></div>
-
</div>
+
</div>
+
+
<!-- ==================== COL3: MESSAGE LINK ===================== -->
+
<div class="col_3">
+
<xsl:choose>
+
<xsl:when test="location_item_id > 0">
+
<a target="_blank">
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=property.uitts.view</xsl:text>
+
<xsl:text>&id=</xsl:text>
+
<xsl:value-of
select="location_item_id"/>
+
</xsl:attribute>
+
Vis melding
+
</a>
+
</xsl:when>
+
<xsl:otherwise>
+
<span class="message">Ingen melding</span>
+
</xsl:otherwise>
+
</xsl:choose>
+
</div>
</li>
</xsl:for-each>
</ul>
@@ -116,17 +182,31 @@
<ul>
<xsl:for-each select="cases_array">
<xsl:variable name="cases_id"><xsl:value-of select="id"/></xsl:variable>
-
<li><span class="order_nr"><xsl:number /></span>. <span
class="case_descr"><xsl:value-of select="descr"/></span>
-
<div class="quick_menu">
-
<a class="quick_edit">
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicase.save_case</xsl:text>
-
<xsl:text>&case_id=</xsl:text>
-
<xsl:value-of select="id"/>
-
<xsl:text>&check_list_id=</xsl:text>
-
<xsl:value-of select="//check_list/id"/>
-
<xsl:text>&phpgw_return_as=json</xsl:text>
-
</xsl:attribute>
+
<li>
+
<div style="display: inline-block;padding: 2em 2%;vertical-align: top;">
+
<span class="order_nr"><xsl:number /></span>.
+
</div>
+
<div style="border-left: 1px solid #DDDDDD;border-right: 1px solid
#DDDDDD;display: inline-block;padding: 1em 2%;width: 73%;">
+
+
<form style="display:none;" 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>
+
<xsl:value-of select="id"/>
+
<xsl:text>&check_list_id=</xsl:text>
+
<xsl:value-of select="//check_list/id"/>
+
<xsl:text>&phpgw_return_as=json</xsl:text>
+
</xsl:attribute>
+
+
<textarea name="case_descr"><xsl:value-of select="descr"/></textarea>
+
<div>
+
<input class='btn_m' type='submit' value='Oppdater' /><input
class='btn_m cancel' type='button' value='Avbryt' />
+
</div>
+
</form>
+
<div class="case_info">
+
<div class="case_descr"><xsl:value-of select="descr"/></div>
+
<div class="quick_menu">
+
<a class="quick_edit first" href="">
endre
</a>
<a class="close_case">
@@ -155,6 +235,10 @@
</a>
</xsl:when>
</xsl:choose>
+
</div>
+
</div>
+
</div>
+
<div style="display: inline-block;padding: 3%;vertical-align: top;">
<xsl:choose>
<xsl:when test="location_item_id > 0">
<a target="_blank">
@@ -171,12 +255,6 @@
</xsl:otherwise>
</xsl:choose>
</div>
-
<div style="display:none;" class="case_info">
-
<div class="case_id"><xsl:value-of select="id"/></div>
-
<div class="case_descr"><xsl:value-of select="descr"/></div>
-
<div class="case_status"><xsl:value-of select="status"/></div>
-
<div class="case_type"><xsl:value-of
select="control_item/type"/></div>
-
</div>
</li>
</xsl:for-each>
</ul>
@@ -190,14 +268,6 @@
<p>Ingen åpne saker</p>
</xsl:otherwise>
</xsl:choose>
- <a style="font-size: 11px;margin-top: 20px;padding: 3px 20px;"
class="btn focus">
- <xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=controller.uicheck_list.register_case</xsl:text>
- <xsl:text>&check_list_id=</xsl:text>
- <xsl:value-of select="check_list/id"/>
- </xsl:attribute>
- Registrer melding
- </a>
</div>
</div>
</xsl:template>
Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css 2012-04-04 09:22:41 UTC
(rev 9102)
+++ trunk/controller/templates/base/css/base.css 2012-04-04 09:23:01 UTC
(rev 9103)
@@ -42,7 +42,6 @@
}
label {
- margin-left: 0.3em;
margin-right: 0,3em;
font-style: normal;
font-size: 13px;
@@ -393,10 +392,13 @@
}
*/
/* Set up common form styles. TODO: needs refinement. */
-legend, label, input, select {
+input{
margin: 0 13px 0 0;
- padding: 2px;
+ padding: 3px 6px;
}
+select{
+ padding: 3px 1px 3px 4px;
+}
label {
line-height:1.5em;
@@ -564,10 +566,6 @@
padding: 3px;
}
-ul.expand_list input {
- margin: 0 8px 0 5px;
-}
-
ul.expand_list h4 span {
padding-left: 5px;
vertical-align: middle;
@@ -681,16 +679,24 @@
margin-top:0;
}
+/* ======================================= CHECK LIST DETAILS
========================================= */
+
#main_content fieldset.check_list_details {
background: none repeat scroll 0 0 #EDF5FF;
- border: 1px solid #A3A3A3;
+ border: 1px solid #DBE5EF;
padding: 15px;
}
-#main_content fieldset.check_item_details{
- background: none repeat scroll 0 0 #EDF5FF;
- border: 1px solid #243356;
- padding: 15px;
+
+input.id {
+ background: none repeat scroll 0 0 #FFFFFF;
+ border: 1px solid #DDDDDD;
+ text-align: right;
+ width: 50px;
}
+input.date {
+ width: 65px;
+ text-align: right;
+}
/* ======================================= CHECK LIST
========================================= */
@@ -782,11 +788,12 @@
h3.check_item_details{
margin-bottom:0;
}
-.check_item textarea{
- width:400px;
- height:100px;
-}
-.check_item label{
+.check_item textarea {
+ display: block;
+ height: 100px;
+ margin-top: 6px;
+ width: 63%;
+}.check_item label{
width:150px;
}
@@ -1088,16 +1095,13 @@
overflow: hidden;
}
.tab_menu a, .hor_menu a {
- background: none repeat scroll 0 0 #FAFAFA;
- border-left: 1px solid #A3A3A3;
- border-right: 1px solid #A3A3A3;
- border-top: 1px solid #A3A3A3;
- color: #000000;
+ background: none repeat scroll 0 0 #CAE3FB;
+ border: 1px solid #D0D9F1;
+ color: #333333;
cursor: pointer;
display: block;
float: left;
- font-size: 12px;
- font-weight: normal;
+ font-weight: bold;
margin-right: 3px;
padding: 7px 0;
text-align: center;
@@ -1105,29 +1109,30 @@
width: 150px;
}
.hor_menu a {
- border:1px solid #d0d9f1;
- background: #ecf1ff;
+ background: none repeat scroll 0 0 #CAE3FB;
+ border: 1px solid #D0D9F1;
}
.tab_menu a.active, .hor_menu a.active {
- background: #2647A0;
- border-left: 1px solid #173073;
- border-right: 1px solid #173073;
- border-top: 1px solid #173073;
- color: #FFF;
+ background: none repeat scroll 0 0 #FAFAFA;
+ border: 1px solid #EEEEEE;
+ color: #000000;
+ font-weight: bold;
}
-.hor_menu a.active {
- border-bottom: 1px solid #173073;
+.tab_menu a, .tab_menu a.active{
+ border-bottom: 0;
}
.tab_item {
- background: none repeat scroll 0 0 #EDF5FF;
- border: 1px solid #A3A3A3;
+ background: none repeat scroll 0 0 #F7FAFF;
+ border: 1px solid #DAE2EE;
margin: 0 318px 0 0;
padding: 15px;
width: 800px;
}
-.tab_item h2{
- margin:0 0 10px;
- font-size: 17px;
+.tab_item h2 {
+ background: none repeat scroll 0 0 #E7EFF8;
+ font-size: 14px;
+ margin: 0 0 10px;
+ padding: 3px 6px;
}
.tab_item h2.last{
margin:20px 0 10px;
@@ -1173,14 +1178,20 @@
z-index: 1;
}
+/* ====================== CHECK LIST ========================== */
+
+#main_content.medium {
+ padding: 20px;
+ width: 900px;
+}
+
/* ====================== CASE DETAILS ========================== */
-#main_content #case_details {
+#case_details {
background: none repeat scroll 0 0 #EDF5FF;
border: 1px solid #DDDDDD;
margin-bottom: 20px;
padding: 15px;
- width: 800px;
}
#case_details label{
display: inline-block;
@@ -1199,15 +1210,15 @@
#case_details h3.last {
margin-bottom:0;
}
-.btn, .btn_m, .btn_sm{
- background: none repeat scroll 0 0 #2647A0;
+.btn, .btn_m, .btn_sm {
+ background: none repeat scroll 0 0 #4F9AEA;
+ border: 1px solid #658CB5;
color: #FFFFFF;
+ cursor: pointer;
display: inline-block;
margin-right: 5px;
padding: 5px 10px;
text-decoration: none;
- border: 1px solid #173073;
- cursor: pointer;
}
.btn_m{
padding: 2px 10px;
@@ -1217,36 +1228,36 @@
font-size: 11px;
padding: 1px 4px;
}
-.btn.cancel{
- background: none repeat scroll 0 0 #DDDDDD;
- border: 1px solid #AAAAAA;
+.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 #DD624B;
- border-bottom: 1px solid #CB563F;
- border-top: 1px solid #EE836F;
- border-left:0;
- border-right:0;
- box-shadow: 0 1px 0 #A9422E, 0 -1px 0 #A9422E;
+.btn.focus, .btn_m.focus {
+ background: none repeat scroll 0 0 #F57056;
+ border-color: #EE836F -moz-use-text-color #CB563F;
+ border-style: solid none;
+ border-width: 1px 0;
color: #FFFFFF;
- margin-top: 1px;
+ margin-top: 1px;
}
-#edit_check_list_menu div{
- float:left;
- margin-left: 75px;
+#edit_check_list_menu div {
+ float: right;
}
#edit_check_list_menu a.focus {
float: none;
- font-size: 11px;
- margin-top: 3px;
- padding: 3px 0;
+ font-size: 12px;
+ margin-top: 1px;
+ padding: 5px 0 4px;
}
-#edit_check_list_menu a.focus.first{
+#edit_check_list_menu a.focus.first {
margin-top: 0;
+ padding-left: 42px;
+ text-align: left;
+ width: 143px;
}
#frm_update_check_list input[type="submit"]{
@@ -1262,7 +1273,6 @@
margin: 2px 0;
display:block;
}
-
#view_cases {
float: left;
margin: 20px 0 0 0;
@@ -1273,7 +1283,7 @@
}
#edit_check_list_menu a {
float: left;
- padding: 14px 0;
+ padding: 17px 0;
text-align: center;
width: 185px;
}
@@ -1289,17 +1299,16 @@
width: 800px;
}
.box_header {
- background: none repeat scroll 0 0 #2647A0;
- border-left: 1px solid #173073;
- border-right: 1px solid #173073;
- border-top: 1px solid #173073;
- color: #FFFFFF;
+ background: none repeat scroll 0 0 #E7EFF8;
+ border-color: #DDDDDD;
+ border-style: solid;
+ border-width: 1px 1px 0;
+ color: #333333;
font-size: 13px;
- font-weight: normal;
+ font-weight: bolder;
margin: 0;
- padding: 3px 0 3px 15px;
+ padding: 5px 0 5px 15px;
text-align: left;
- width: 815px;
}
/* ======================== VIEW CASES ============================= */
@@ -1313,37 +1322,78 @@
li.check_item_case ul li {
background: none repeat scroll 0 0 #E7EFF8;
border: 1px solid #DDDDDD;
- margin: 10px 0 0;
- padding: 5px;
+ margin: 10px 0 0 20px;
}
li.check_item_case ul li.quick_edit {
padding: 0;
}
-
li.check_item_case .quick_edit h4 {
- background: none repeat scroll 0 0 #CCCCCC;
color: #000000;
margin: 0;
padding: 2px 10px;
}
+li.check_item_case .col_1 {
+ display: inline-block;
+ padding: 2em 2%;
+ vertical-align: top;
+}
+li.check_item_case .col_2 {
+ border-left: 1px solid #DDDDDD;
+ border-right: 1px solid #DDDDDD;
+ display: inline-block;
+ padding: 1em 2%;
+ width: 73%;
+}
+li.check_item_case .col_3 {
+ display: inline-block;
+ padding: 3%;
+ vertical-align: top;
+}
#main_content .quick_edit fieldset {
padding: 5px;
}
+
+/* ======================== FORM UPDATE CASE ============================= */
+
.frm_update_case label {
display: block;
}
.frm_update_case textarea {
- width: 500px;
- display: block;
+ display: block;
+ width: 98%;
}
-.quick_edit hr {
- color:#fafafa;
+.frm_update_case .row, .case_info .row{
+ margin: 5px 0;
}
+.frm_update_case .row.first, .case_info .row.first{
+ margin-top:0;
+}
.frm_update_case input[type="submit"], .frm_update_case input[type="button"] {
float: left;
margin-top: 10px;
}
+.frm_update_case input[type="text"]{
+ width: 170px;
+}
+.frm_update_case select {
+ width: 184px;
+}
+.frm_update_case label {
+ width: 70px;
+ display:inline-block;
+ font-weight:bold;
+ margin-right: 5px;
+}
+
+/* ======================== FORM REGISTER CASE ============================= */
+
+.frm_register_case input[type="text"]{
+ width: 170px;
+}
+.frm_register_case select {
+ width: 184px;
+}
a.view_check_list{
color: #FFFFFF;
display: block;
@@ -1353,30 +1403,18 @@
text-decoration: none;
width: 24px;
}
-.quick_edit label{
- font-weight:bold;
- vertical-align:top;
-}
-.quick_edit h3{
- margin:0;
-}
-.quick_edit select{
- display: inline-block;
- vertical-align:top;
-}
+
+/* ======================== QUICK MENU ============================= */
+
.quick_menu {
font-size: 12px;
- margin-left: 10px;
- padding: 10px 2px 0;
+ padding: 10px 0 0;
}
-.quick_menu a{
- margin: 0 5px;
- text-decoration: underline;
+.quick_menu a {
+ margin-right: 5px;
+ text-decoration: underline;
}
-.quick_menu .message {
- color: #333333;
- margin-left: 30px;
-}
+
ul#groups {
margin-left: 10px;
margin-top: 5px;
@@ -1415,9 +1453,18 @@
padding: 7px 0;
}
+/* ======================== CONTROL DETAILS ============================== */
+
+#control_details label {
+ display: inline-block;
+ font-weight: bold;
+ width: 100px;
+}
+
#control_details #select_all{
margin-left: 660px;
}
+
#control_details #location_form{
margin-left: 20px;
margin-bottom: 20px;
@@ -1428,11 +1475,3 @@
padding: 3px 6px;
display: none;
}
-
-/* ======================== CONTROL DETAILS ============================== */
-
-#control_details label {
- display: inline-block;
- font-weight: bold;
- width: 100px;
-}
\ No newline at end of file
| [Prev in Thread] | Current Thread | [Next in Thread] |