[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8944] Merge 8939:8943 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [8944] Merge 8939:8943 from trunk |
|
Date: |
Wed, 22 Feb 2012 09:31:31 +0000 |
Revision: 8944
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8944
Author: sigurdne
Date: 2012-02-22 09:31:30 +0000 (Wed, 22 Feb 2012)
Log Message:
-----------
Merge 8939:8943 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/activitycalendarfrontend/setup/phpgw_no.lang
branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
branches/Version-1_0-branch/controller/inc/class.uicontrol.inc.php
branches/Version-1_0-branch/controller/inc/model/class.control.inc.php
branches/Version-1_0-branch/controller/js/controller/custom_ui.js
branches/Version-1_0-branch/controller/templates/base/control_item/choose_control_items.xsl
branches/Version-1_0-branch/controller/templates/base/css/base.css
branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/activitycalendarfrontend/setup/phpgw_no.lang
2012-02-22 09:29:25 UTC (rev 8943)
+++ branches/Version-1_0-branch/activitycalendarfrontend/setup/phpgw_no.lang
2012-02-22 09:31:30 UTC (rev 8944)
@@ -93,4 +93,5 @@
edit_organization activitycalendarfrontend no Rediger
organisasjonsinformasjon
address activitycalendarfrontend no Adresse
activity_edit_helptext_step1 activitycalendarfrontend no Skal du
endre opplysninger knyttet til en aktivitet må du være registrert som
kontaktperson for organisasjonen.<br/>Du velger organisasjon og aktivitet i
bildet under, og får en e-post i retur med en lenke til endringsskjema.
-mail_body_update_frontend activitycalendarfrontend no Dette
er en melding fra Bergen kommune/AktivBy.<br/>I aktivitetsoversikten som ligger
i kommuneportalen på internett, står du registrert som kontaktperson for
%1.<br/>Det har kommet inn et endringsønske på denne aktiviteten. Bruk lenken
under for å endre opplysningene om aktiviteten.<br/>%2<br/><br/><br/> Mvh %3
kulturkontor
\ No newline at end of file
+mail_body_update_frontend activitycalendarfrontend no Dette
er en melding fra Bergen kommune/AktivBy.<br/>I aktivitetsoversikten som ligger
i kommuneportalen på internett, står du registrert som kontaktperson for
%1.<br/>Det har kommet inn et endringsønske på denne aktiviteten. Bruk lenken
under for å endre opplysningene om aktiviteten.<br/>%2<br/><br/><br/> Mvh %3
kulturkontor
+mail_subject_update activitycalendar no Melding fra AktivBy -
aktivitetsoversikt
\ No newline at end of file
Modified: branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
2012-02-22 09:29:25 UTC (rev 8943)
+++ branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
2012-02-22 09:31:30 UTC (rev 8944)
@@ -225,9 +225,6 @@
$controls_calendar_array =
$this->calendar_builder->build_calendar_array( $controls_for_location_array,
12, "view_months" );
-
- print_r($controls_calendar_array);
-
$location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
$heading_array = array("Jan", "Feb", "Mar", "Apr",
"Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Des");
Modified: branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
2012-02-22 09:29:25 UTC (rev 8943)
+++ branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
2012-02-22 09:31:30 UTC (rev 8944)
@@ -91,6 +91,12 @@
self::set_active_menu('controller::control::check_list');
}
+ /**
+ * Public function for displaying checklists
+ *
+ * @param HTTP:: phpgw_return_as
+ * @return data array
+ */
public function index()
{
if(phpgw::get_var('phpgw_return_as') == 'json') {
@@ -182,6 +188,12 @@
self::render_template_xsl('datatable', $data);
}
+ /**
+ * Public function for displaying the add check list form
+ *
+ * @param HTTP:: location code, control id, date
+ * @return data array
+ */
function add_check_list(){
$location_code = phpgw::get_var('location_code');
$control_id = phpgw::get_var('control_id');
@@ -233,6 +245,12 @@
self::render_template_xsl(array('check_list/check_list_tab_menu','check_list/add_check_list'),
$data);
}
+ /**
+ * Public function for displaying the edit check list form
+ *
+ * @param HTTP:: check list id
+ * @return data array
+ */
function edit_check_list(){
$check_list_id = phpgw::get_var('check_list_id');
@@ -266,6 +284,12 @@
self::render_template_xsl(array('check_list/check_list_tab_menu','check_list/edit_check_list'),
$data);
}
+ /**
+ * Public function for displaying the edit check list form
+ *
+ * @param HTTP:: check list id
+ * @return data array
+ */
function view_cases_for_check_list(){
$check_list_id = phpgw::get_var('check_list_id');
@@ -295,6 +319,12 @@
self::render_template_xsl(array('check_list/check_list_tab_menu',
'check_list/view_cases_for_check_list'), $data);
}
+ /**
+ * Public function for saving a check list
+ *
+ * @param HTTP:: location code, control id, status etc.. (check
list details)
+ * @return data array
+ */
function save_check_list(){
$location_code = phpgw::get_var('location_code');
$control_id = phpgw::get_var('control_id');
@@ -329,6 +359,12 @@
$this->redirect(array('menuaction' =>
'controller.uicheck_list.edit_check_list', 'check_list_id'=>$check_list_id));
}
+ /**
+ * Public function for displaying the create message form
+ *
+ * @param HTTP:: check list id
+ * @return data array
+ */
function create_case_message(){
$check_list_id = phpgw::get_var('check_list_id');
@@ -361,6 +397,12 @@
self::render_template_xsl('create_case_messsage',
$data);
}
+ /**
+ * Public function for displaying the create message form
+ *
+ * @param HTTP:: check list id
+ * @return data array
+ */
public function view_control_info(){
$check_list_id = phpgw::get_var('check_list_id');
Modified: branches/Version-1_0-branch/controller/inc/class.uicontrol.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicontrol.inc.php
2012-02-22 09:29:25 UTC (rev 8943)
+++ branches/Version-1_0-branch/controller/inc/class.uicontrol.inc.php
2012-02-22 09:31:30 UTC (rev 8944)
@@ -96,6 +96,12 @@
self::set_active_menu('controller::control');
}
+ /**
+ * Fetches controls and returns to datatable
+ *
+ * @param HTTP::phpgw_return_as specifies how data should be
returned
+ * @return data array
+ */
public function control_list()
{
if(phpgw::get_var('phpgw_return_as') == 'json') {
@@ -266,6 +272,12 @@
self::render_template_xsl('datatable', $data);
}
+ /**
+ * Fetches control details from db and returns to view
+ *
+ * @param HTTP:: control id
+ * @return data array
+ */
public function view_control_details()
{
$control_id = phpgw::get_var('id');
@@ -330,6 +342,12 @@
$this->use_yui_editor(array('description'));
}
+ /**
+ * Public function for saving control details
+ *
+ * @param HTTP:: control id, control details fields
+ * @return redirect to function view_control_groups
+ */
public function save_control_details(){
$control_id = phpgw::get_var('control_id');
@@ -367,7 +385,13 @@
}
}
- // Displays control groups based on previously chosen control
area
+ /**
+ * Public function for viewing control groups
+ * Displays control groups by chosen control area
+ *
+ * @param HTTP:: control id
+ * @return data array
+ */
public function view_control_groups(){
$control_id = phpgw::get_var('control_id');
$control = $this->so->get_single($control_id);
@@ -416,12 +440,10 @@
}
/**
- * Public function for saving control groups. Saves
- * the database and the virtual file system (vfs).
+ * Public function for saving control groups.
*
- * @param HTTP::id the document id
- * @return true if successful, false if error, permission
denied message on
- * not enough privileges
+ * @param HTTP::id the control_id, and a comma seperated
list of group ids
+ * @return redirect to function view_control_items
*/
public function save_control_groups(){
$control_id = phpgw::get_var('control_id');
@@ -442,14 +464,6 @@
}
}
- /*
- // Deleting earlier saved control groups
-
$this->so_control_group_list->delete_control_groups($control_id);
-
- // Deleting earlier saved control items
-
$this->so_control_item_list->delete_control_items($control_id);
- */
-
$group_order_nr = 1;
// Saving control groups
@@ -473,7 +487,12 @@
$this->redirect(array('menuaction' =>
'controller.uicontrol.view_control_items', 'control_id'=>$control_id));
}
- // Gets a comma separated list of control groups, and displays
control items for these groups
+ /**
+ * Public function for viewing control items
+ *
+ * @param HTTP::id the control_id
+ * @return redirect to function view_control_items
+ */
public function view_control_items(){
$control_id = phpgw::get_var('control_id', 'int');
$control = $this->so->get_single($control_id);
@@ -531,7 +550,12 @@
self::render_template_xsl(array('control/control_tabs',
'control_item/choose_control_items'), $data);
}
- // Saves chosen control items through receiving a comma
separated list of control tags (1:2, control_group_id:control_item_id)
+ /**
+ * Public function for saving control items
+ *
+ * @param HTTP::id the control_id and a comma separated
list of tags (1:2, control_group_id:control_item_id)
+ * @return redirect to function view_control_items
+ */
public function save_control_items(){
$control_id = phpgw::get_var('control_id');
@@ -560,7 +584,13 @@
$this->redirect(array('menuaction' =>
'controller.uicontrol.view_check_list', 'control_id'=>$control_id ));
}
-
+
+ /**
+ * Public function for viewing chosen control items
+ *
+ * @param HTTP::id the control_id
+ * @return data array
+ */
public function view_check_list(){
$control_id = phpgw::get_var('control_id');
$control = $this->so->get_single($control_id);
@@ -655,8 +685,13 @@
return $tabs;
}
-
- // Returns control list info as JSON
+
+ /**
+ * Public function for retrieving controls that has a certain
control area
+ *
+ * @param HTTP:: control area id
+ * @return array of controls as json
+ */
public function get_controls_by_control_area()
{
$control_area_id = phpgw::get_var('control_area_id');
@@ -669,7 +704,12 @@
return null;
}
- // Returns locations for a control
+ /**
+ * Public function for retrieving locations that is assigned to
a control
+ *
+ * @param HTTP:: control id
+ * @return array of locations as json
+ */
public function get_locations_for_control()
{
$control_id = phpgw::get_var('control_id');
@@ -697,6 +737,13 @@
return $this->yui_results($results);
}
+ /**
+ * Add data for context menu
+ *
+ * @param $value pointer to
+ * @param $key ?
+ * @param $params [type of query, editable]
+ */
public function add_actions(&$value, $key, $params)
{
unset($value['query_location']);
Modified: branches/Version-1_0-branch/controller/inc/model/class.control.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/model/class.control.inc.php
2012-02-22 09:29:25 UTC (rev 8943)
+++ branches/Version-1_0-branch/controller/inc/model/class.control.inc.php
2012-02-22 09:31:30 UTC (rev 8944)
@@ -268,13 +268,19 @@
$this->set_title(phpgw::get_var('title','string'));
$this->set_description(phpgw::get_var('description','html'));
- $start_date_ts =
date_helper::get_timestamp_from_date( phpgw::get_var('start_date','string'),
"d/m-Y" );
- $this->set_start_date($start_date_ts);
-
- if( phpgw::get_var('end_date','string') != ""){
+ if(phpgw::get_var('start_date','string') != '')
+ {
+ $start_date_ts =
date_helper::get_timestamp_from_date( phpgw::get_var('start_date','string'),
"d/m-Y" );
+ $this->set_start_date($start_date_ts);
+ }else
+ $this->set_start_date(0);
+
+ if( phpgw::get_var('end_date','string') != '')
+ {
$end_date_ts =
date_helper::get_timestamp_from_date( phpgw::get_var('end_date','string'),
"d/m-Y" );
$this->set_end_date( $end_date_ts );
- }else{
+ }else
+ {
$this->set_end_date( 0 );
}
@@ -299,8 +305,7 @@
'control_area_name' =>
$this->get_control_area_name(),
'repeat_type' => $this->get_repeat_type(),
'repeat_interval' =>
$this->get_repeat_interval(),
- 'responsibility_name' =>
$this->get_responsibility_name(),
-
- );
+ 'responsibility_name' =>
$this->get_responsibility_name()
+ );
}
}
Modified: branches/Version-1_0-branch/controller/js/controller/custom_ui.js
===================================================================
--- branches/Version-1_0-branch/controller/js/controller/custom_ui.js
2012-02-22 09:29:25 UTC (rev 8943)
+++ branches/Version-1_0-branch/controller/js/controller/custom_ui.js
2012-02-22 09:31:30 UTC (rev 8944)
@@ -18,6 +18,9 @@
}
});
+
+ /* ========================== EXPANDING/COLLAPSING ALL LISTS
====================== */
+
$(".expand_all").live("click", function(){
$(this).addClass("focus");
$(".collapse_all").removeClass("focus");
Modified:
branches/Version-1_0-branch/controller/templates/base/control_item/choose_control_items.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/control_item/choose_control_items.xsl
2012-02-22 09:29:25 UTC (rev 8943)
+++
branches/Version-1_0-branch/controller/templates/base/control_item/choose_control_items.xsl
2012-02-22 09:31:30 UTC (rev 8944)
@@ -18,7 +18,7 @@
<ul class="control_items">
<xsl:for-each
select="groups_with_control_items">
- <ul class="itemlist expand_list">
+ <ul class="expand_list">
<li>
<xsl:choose>
<xsl:when
test="group_control_items/child::node()">
@@ -29,10 +29,10 @@
<xsl:variable name="control_item_id"><xsl:value-of
select="control_item/id"/></xsl:variable>
<xsl:choose>
<xsl:when test="checked = 1">
-
<li><xsl:number/>. <input type="checkbox" checked="checked"
id="ch_{$control_group_id}:{$control_item_id}"
value="{$control_group_id}:{$control_item_id}" /><xsl:value-of
select="control_item/title"/></li>
+
<li><span><xsl:number/>.</span><input type="checkbox"
checked="checked" id="ch_{$control_group_id}:{$control_item_id}"
value="{$control_group_id}:{$control_item_id}" /><xsl:value-of
select="control_item/title"/></li>
</xsl:when>
<xsl:otherwise>
-
<li><xsl:number/>. <input type="checkbox"
id="ch_{$control_group_id}:{$control_item_id}"
value="{$control_group_id}:{$control_item_id}" /><xsl:value-of
select="control_item/title"/></li>
+
<li><span><xsl:number/>.</span><input type="checkbox"
id="ch_{$control_group_id}:{$control_item_id}"
value="{$control_group_id}:{$control_item_id}" /><xsl:value-of
select="control_item/title"/></li>
</xsl:otherwise>
</xsl:choose>
</xsl:for-each>
Modified: branches/Version-1_0-branch/controller/templates/base/css/base.css
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/css/base.css
2012-02-22 09:29:25 UTC (rev 8943)
+++ branches/Version-1_0-branch/controller/templates/base/css/base.css
2012-02-22 09:31:30 UTC (rev 8944)
@@ -471,6 +471,47 @@
list-style-position: inside;
}
+
+/* ======================================= ITEM LIST
========================================= */
+
+ul.itemlist {
+ position: relative;
+}
+ul.itemlist li {
+ padding: 3px 0;
+}
+
+ul.itemlist li.odd{
+ background: none repeat scroll 0 0 #DBE7F5;
+}
+
+ul.itemlist h3 {
+ font-size: 18px;
+ margin: 0 0 5px;
+}
+
+ul.groups {
+ position: relative;
+}
+ul.groups li {
+ padding: 3px 0;
+}
+
+ul.groups li.odd{
+ background: none repeat scroll 0 0 #DBE7F5;
+}
+
+ul.groups h3 {
+ font-size: 18px;
+ margin: 0 0 5px;
+}
+
+.drag_group {
+ width: 650px;
+}
+
+/* ======================================= EXPAND LIST
========================================= */
+
ul.expand_list h4 {
cursor: pointer;
font-size: 17px;
@@ -483,10 +524,15 @@
margin-left:21px;
}
-ul.expand_list li ul li{
+ul.expand_list li ul li {
margin-bottom: 3px;
+ padding: 3px;
}
+ul.expand_list input {
+ margin: 0 8px 0 5px;
+}
+
ul.expand_list h4 span {
padding-left: 5px;
vertical-align: middle;
@@ -512,42 +558,6 @@
padding:20px;
}
-ul.itemlist {
- position: relative;
-}
-ul.itemlist li {
- padding: 3px 0;
-}
-
-ul.itemlist li.odd{
- background: none repeat scroll 0 0 #DBE7F5;
-}
-
-ul.itemlist h3 {
- font-size: 18px;
- margin: 0 0 5px;
-}
-
-ul.groups {
- position: relative;
-}
-ul.groups li {
- padding: 3px 0;
-}
-
-ul.groups li.odd{
- background: none repeat scroll 0 0 #DBE7F5;
-}
-
-ul.groups h3 {
- font-size: 18px;
- margin: 0 0 5px;
-}
-
-.drag_group {
- width: 650px;
-}
-
.yui-content h2{
margin:0 0 10px;
}
@@ -1004,6 +1014,9 @@
textarea{
padding: 4px;
}
+
+/*================================== EXPAND MENU
======================================== */
+
.expand_menu div.focus{
background: url('../../../images/bg_expand_active.png') no-repeat;
color: #FFF;
Modified: branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
2012-02-22 09:29:25 UTC (rev 8943)
+++ branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
2012-02-22 09:31:30 UTC (rev 8944)
@@ -1256,7 +1256,10 @@
)
{
$prefs_coordinator =
$this->bocommon->create_preferences('property',$values['coordinator']);
-
$toarray[] = $prefs_coordinator['email'];
+
if(isset($prefs_coordinator['email']) && $prefs_coordinator['email'])
+ {
+
$toarray[] = $prefs_coordinator['email'];
+ }
}
}
Modified: branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
2012-02-22 09:29:25 UTC (rev 8943)
+++ branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
2012-02-22 09:31:30 UTC (rev 8944)
@@ -1099,16 +1099,19 @@
if($this->account!=$project['coordinator'] &&
$config->config_data['workorder_approval'])
{
$prefs_coordinator =
$this->bocommon->create_preferences('property',$project['coordinator']);
- $toarray[] =
$prefs_coordinator['email'];
+
if(isset($prefs_coordinator['email']) && $prefs_coordinator['email'])
+ {
+ $toarray[] =
$prefs_coordinator['email'];
+ }
}
}
- $notify_list =
execMethod('property.notify.read', array
- (
- 'location_id'
=> $location_id,
-
'location_item_id' => $id
- )
- );
+ $notify_list =
execMethod('property.notify.read', array
+ (
+ 'location_id'
=> $location_id,
+ 'location_item_id'
=> $id
+ )
+ );
$subject=lang('workorder %1 has been
edited',$id);
$sms_text = "{$subject}.
\r\n{$GLOBALS['phpgw_info']['user']['fullname']}
\r\n{$GLOBALS['phpgw_info']['user']['preferences']['property']['email']}";
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8944] Merge 8939:8943 from trunk,
Sigurd Nes <=