[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8825]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [8825] |
|
Date: |
Thu, 09 Feb 2012 13:35:09 +0000 |
Revision: 8825
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8825
Author: vator
Date: 2012-02-09 13:35:09 +0000 (Thu, 09 Feb 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.uicheck_list.inc.php
trunk/controller/setup/tables_current.inc.php
trunk/controller/setup/tables_update.inc.php
trunk/controller/templates/base/calendar/view_calendar_month.xsl
trunk/controller/templates/base/calendar/view_calendar_year.xsl
trunk/controller/templates/base/css/base.css
Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php 2012-02-09 13:34:54 UTC
(rev 8824)
+++ trunk/controller/inc/class.uicheck_list.inc.php 2012-02-09 13:35:09 UTC
(rev 8825)
@@ -514,7 +514,7 @@
// Fetches all control items for a check list
$control_items =
$this->so_control_item_list->get_control_items_by_control($check_list->get_control_id());
- // Fetches all check items for a check list as objects
+ // Fetches all check items for a check list as objects
$check_items =
$this->so_check_item->get_check_items($check_list_id, null, null,
"return_object");
// Puts closed check items of type measurement into
array
Modified: trunk/controller/setup/tables_current.inc.php
===================================================================
--- trunk/controller/setup/tables_current.inc.php 2012-02-09 13:34:54 UTC
(rev 8824)
+++ trunk/controller/setup/tables_current.inc.php 2012-02-09 13:35:09 UTC
(rev 8825)
@@ -204,14 +204,15 @@
'fd' => array(
'id' => array('type' =>
'auto', 'nullable' => false),
'check_item_id' => array('type' =>
'int', 'precision' => '4', 'nullable' => false),
- 'status' => array('type' => 'int', 'precision'
=> '4', 'nullable' => false),
- 'location_id' => array('type' => 'int',
'precision' => '4', 'nullable' => true), // representer meldingsfregisteret
- 'location_item_id' => array('type' => 'int', 'precision' =>
'8', 'nullable' => true), //meldings id
- 'descr' => array('type' => 'text','nullable' => true),
- 'user_id' => array('type' => 'int','precision' =>
'4','nullable' => true),
- 'entry_date' => array('type' => 'int', 'precision' =>
8,'nullable' => false),
- 'modified_date' => array('type' => 'int', 'precision' =>
8,'nullable' => True),
- 'modified_by' => array('type' => 'int', 'precision' =>
4,'nullable' => True),
+ 'status' => array('type'
=> 'int', 'precision' => '4', 'nullable' => false),
+ 'measurement' => array('type' =>
'varchar', 'precision' => '50', 'nullable' => True),
+ 'location_id' => array('type' =>
'int', 'precision' => '4', 'nullable' => true), // representer
meldingsfregisteret
+ 'location_item_id' => array('type' => 'int', 'precision'
=> '8', 'nullable' => true), //meldings id
+ 'descr' => array('type' =>
'text','nullable' => true),
+ 'user_id' => array('type' =>
'int','precision' => '4','nullable' => true),
+ 'entry_date' => array('type' => 'int', 'precision'
=> 8,'nullable' => false),
+ 'modified_date' => array('type' => 'int',
'precision' => 8,'nullable' => True),
+ 'modified_by' => array('type' => 'int', 'precision'
=> 4,'nullable' => True),
),
'pk' => array('id'),
'fk' => array('controller_check_item' => array('check_item_id'
=> 'id')),
Modified: trunk/controller/setup/tables_update.inc.php
===================================================================
--- trunk/controller/setup/tables_update.inc.php 2012-02-09 13:34:54 UTC
(rev 8824)
+++ trunk/controller/setup/tables_update.inc.php 2012-02-09 13:35:09 UTC
(rev 8825)
@@ -575,3 +575,21 @@
return
$GLOBALS['setup_info']['controller']['currentver'];
}
}
+
+ $test[] = '0.1.27';
+ function controller_upgrade0_1_27()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('controller_check_item_case','measurement',array(
+ 'type' => 'varchar',
+ 'precision' => 50,
+ 'nullable' => true
+ ));
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['controller']['currentver'] =
'0.1.28';
+ return
$GLOBALS['setup_info']['controller']['currentver'];
+ }
+ }
Modified: trunk/controller/templates/base/calendar/view_calendar_month.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_month.xsl
2012-02-09 13:34:54 UTC (rev 8824)
+++ trunk/controller/templates/base/calendar/view_calendar_month.xsl
2012-02-09 13:35:09 UTC (rev 8825)
@@ -5,13 +5,13 @@
<xsl:variable name="view_location_code"><xsl:value-of
select="view_location_code"/></xsl:variable>
<div id="main_content">
-
- <div style="float:left;">
+ <div id="control_plan">
+ <div class="col_1">
<h1><xsl:value-of
select="location_array/loc1_name"/></h1>
<h3 style="margin:0;font-size:19px;">Kalenderoversikt
for <xsl:value-of select="period"/></h3>
</div>
- <div style="float:right;width:300px;margin-top:40px;">
+ <div class="col_2">
<form action="#">
<input type="hidden" name="period_type"
value="view_year" />
<input type="hidden" name="year">
@@ -49,13 +49,10 @@
</ul>
</div>
- <div id="cal_wrp">
- <div style="float: left;margin-bottom: 10px;margin-left:
735px;margin-top: 30px;"><a class="move_cal_right" href="#"><img
src="controller/images/arrow_left.png" width="16"/></a></div>
- <div style="float:left;margin-top: 30px;margin-left: 374px;"><a
class="move_cal_left" href="#"><img src="controller/images/arrow_right.png"
width="16"/></a></div>
-
+ <div id="cal_wrp">
<script>
$(document).ready(function() {
- $(".move_cal_left").click(function(){
+ $(".move_left").click(function(){
var leftStrVal =
$("#days_view").css("left");
var leftNumVal =
leftStrVal.substring(0, leftStrVal.indexOf('px'));
@@ -70,7 +67,7 @@
}
});
- $(".move_cal_right").click(function(){
+ $(".move_right").click(function(){
var leftStrVal =
$("#days_view").css("left");
var leftNumVal =
leftStrVal.substring(0, leftStrVal.indexOf('px'));
@@ -89,7 +86,11 @@
});
</script>
- <ul style="clear:left;" class="calendar info month">
+ <div class="nav">
+ <a class="move_left" href="#"><img
src="controller/images/arrow_right.png" width="16"/></a>
+ <a class="move_right" href="#"><img
src="controller/images/arrow_left.png" width="16"/></a>
+ </div>
+ <ul class="calendar month">
<li class="heading">
<div class="id">ID</div>
<div class="title">Tittel</div>
@@ -273,4 +274,5 @@
</div>
</div>
</div>
+</div>
</xsl:template>
Modified: trunk/controller/templates/base/calendar/view_calendar_year.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-02-09 13:34:54 UTC (rev 8824)
+++ trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-02-09 13:35:09 UTC (rev 8825)
@@ -5,8 +5,9 @@
<xsl:variable name="view_location_code"><xsl:value-of
select="view_location_code"/></xsl:variable>
<div id="main_content">
-
- <div style="float:left;">
+
+ <div id="control_plan">
+ <div class="col_1">
<xsl:choose>
<xsl:when test="show_location">
<h1><xsl:value-of
select="control_name"/></h1>
@@ -18,7 +19,7 @@
<h3 style="margin:0;font-size:19px;">Kalenderoversikt
for <xsl:value-of select="period"/></h3>
</div>
- <div style="float:right;width:300px;margin-top:40px;">
+ <div class="col_2">
<xsl:choose>
<xsl:when test="show_location"> </xsl:when>
<xsl:otherwise>
@@ -240,4 +241,5 @@
</xsl:choose>
</ul>
</div>
+</div>
</xsl:template>
Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css 2012-02-09 13:34:54 UTC
(rev 8824)
+++ trunk/controller/templates/base/css/base.css 2012-02-09 13:35:09 UTC
(rev 8825)
@@ -667,8 +667,8 @@
}
#main_content {
- padding:20px;
- width: 1150px;
+ padding: 20px;
+ width: 1150px;
}
#main_content.groups{
@@ -806,6 +806,21 @@
ul.check_list {
width: 925px;
}
+
+/* ====================== CALENDAR ========================== */
+
+#control_plan .col_1 {
+ float: left;
+ height: 240px;
+ width: 600px;
+}
+
+#control_plan .col_2 {
+ float:right;
+ width:300px;
+ margin-top:40px;
+}
+
ul.calendar li{
clear:left;
}
@@ -814,28 +829,43 @@
font-size:16px;
}
ul.calendar {
+ clear: right;
float: left;
margin-top: 30px;
+ width: 100%;
}
+ul.calendar.month {
+ margin-top: 0;
+ width: 60%;
+}
ul.calendar li div {
float: left;
width: 30px;
padding: 3px;
text-align: center;
}
-ul.calendar.info {
- background:none;
- border:0;
+#cal_wrp {
+ clear: both;
float: left;
+ margin-top: 30px;
+ width: 100%;
}
-
+#cal_wrp .nav{
+ padding: 1% 0;
+}
+a.move_left{
+ float: right;
+}
+a.move_right {
+ float: right;
+ margin-right: 34%;
+}
#days_wrp {
- float: left;
+ float: right;
+ height: 800px;
+ overflow-x: hidden;
position: relative;
- width: 420px;
- overflow-x: hidden;
- height: 800px;
- margin-left: 40px;
+ width: 37%;
}
ul.calendar.days li div {
width: 24px;
@@ -874,9 +904,7 @@
ul.calendar div.frequency, ul.calendar.info div.frequency {
width: 100px;
}
-ul.calendar.month {
- margin-top:0;
-}
+
#info_box {
background: none repeat scroll 0 0 #EDF5FF;
border: 1px solid #243356;
@@ -1268,9 +1296,6 @@
.quick_menu a{
margin: 0 5px;
}
-#cal_wrp{
- clear:both;
-}
ul#groups {
margin-left: 10px;
margin-top: 5px;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8825],
Torstein <=