[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10569] Merge 10544:10568 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [10569] Merge 10544:10568 from trunk |
|
Date: |
Tue, 04 Dec 2012 10:09:45 +0000 |
Revision: 10569
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10569
Author: sigurdne
Date: 2012-12-04 10:09:44 +0000 (Tue, 04 Dec 2012)
Log Message:
-----------
Merge 10544:10568 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/booking/inc/class.bobooking.inc.php
branches/Version-1_0-branch/controller/inc/hook_home.inc.php
branches/Version-1_0-branch/frontend/inc/class.bofellesdata.inc.php
branches/Version-1_0-branch/logistic/inc/class.sorequirement.inc.php
branches/Version-1_0-branch/logistic/inc/class.sorequirement_resource_allocation.inc.php
branches/Version-1_0-branch/logistic/inc/class.sorequirement_value.inc.php
branches/Version-1_0-branch/logistic/inc/class.soresource_type_requirement.inc.php
branches/Version-1_0-branch/logistic/inc/class.uiactivity.inc.php
branches/Version-1_0-branch/logistic/inc/class.uirequirement_resource_allocation.inc.php
branches/Version-1_0-branch/logistic/inc/model/class.activity.inc.php
branches/Version-1_0-branch/logistic/templates/base/activity/activity_tabs.xsl
branches/Version-1_0-branch/logistic/templates/base/activity/add_activity_item.xsl
branches/Version-1_0-branch/logistic/templates/base/css/base.css
branches/Version-1_0-branch/logistic/templates/base/requirement/requirement_tabs.xsl
branches/Version-1_0-branch/phpgwapi/inc/class.js.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.sbox.inc.php
branches/Version-1_0-branch/property/inc/class.bolocation.inc.php
branches/Version-1_0-branch/property/inc/class.uicondition_survey.inc.php
branches/Version-1_0-branch/property/inc/class.uitts.inc.php
branches/Version-1_0-branch/property/js/portico/condition_survey_edit.js
branches/Version-1_0-branch/property/js/yahoo/budget.obligations.js
branches/Version-1_0-branch/property/setup/setup.inc.php
branches/Version-1_0-branch/property/templates/base/attributes_form.xsl
branches/Version-1_0-branch/property/templates/base/attributes_view.xsl
branches/Version-1_0-branch/property/templates/base/condition_survey.xsl
branches/Version-1_0-branch/property/templates/base/contact_form.xsl
branches/Version-1_0-branch/property/templates/base/css/base.css
branches/Version-1_0-branch/property/templates/base/location_form.xsl
branches/Version-1_0-branch/property/templates/base/location_view.xsl
branches/Version-1_0-branch/property/templates/base/tts.xsl
Added Paths:
-----------
branches/Version-1_0-branch/property/templates/base/condition_survey_import.xsl
branches/Version-1_0-branch/property/templates/base/location_form2.xsl
branches/Version-1_0-branch/property/templates/base/location_view2.xsl
Property Changed:
----------------
branches/Version-1_0-branch/
branches/Version-1_0-branch/logistic/inc/class.sorequirement.inc.php
branches/Version-1_0-branch/logistic/inc/class.sorequirement_resource_allocation.inc.php
branches/Version-1_0-branch/logistic/inc/class.sorequirement_value.inc.php
branches/Version-1_0-branch/logistic/inc/class.soresource_type_requirement.inc.php
branches/Version-1_0-branch/logistic/inc/class.uirequirement.inc.php
branches/Version-1_0-branch/logistic/inc/class.uirequirement_resource_allocation.inc.php
branches/Version-1_0-branch/logistic/inc/class.uiresource_type_requirement.inc.php
branches/Version-1_0-branch/logistic/inc/model/class.requirement.inc.php
branches/Version-1_0-branch/logistic/inc/model/class.requirement_resource_allocation.inc.php
branches/Version-1_0-branch/logistic/inc/model/class.requirement_value.inc.php
branches/Version-1_0-branch/logistic/inc/model/class.resource_type_requirement.inc.php
branches/Version-1_0-branch/logistic/js/logistic/activity.js
branches/Version-1_0-branch/logistic/js/logistic/ajax.js
branches/Version-1_0-branch/logistic/js/logistic/project.js
branches/Version-1_0-branch/logistic/js/logistic/requirement.js
branches/Version-1_0-branch/logistic/js/logistic/resource_allocation.js
branches/Version-1_0-branch/logistic/js/logistic/resource_type_requirement.js
branches/Version-1_0-branch/logistic/setup/tables_update.inc.php
branches/Version-1_0-branch/logistic/templates/base/activity/activity_tabs.xsl
branches/Version-1_0-branch/logistic/templates/base/activity/add_activity_item.xsl
branches/Version-1_0-branch/logistic/templates/base/activity/view_activity_item.xsl
branches/Version-1_0-branch/logistic/templates/base/allocation/book_resources.xsl
branches/Version-1_0-branch/logistic/templates/base/project/resource_type_requirement_item.xsl
branches/Version-1_0-branch/logistic/templates/base/requirement/requirement_item.xsl
branches/Version-1_0-branch/logistic/templates/base/requirement/requirement_overview.xsl
branches/Version-1_0-branch/logistic/templates/base/requirement/requirement_tabs.xsl
branches/Version-1_0-branch/logistic/templates/base/requirement/requirement_values.xsl
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,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494,10496-10503,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543
+
/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,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494,10496-10503,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543,10545-10568
Modified: branches/Version-1_0-branch/booking/inc/class.bobooking.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/inc/class.bobooking.inc.php
2012-12-04 10:06:40 UTC (rev 10568)
+++ branches/Version-1_0-branch/booking/inc/class.bobooking.inc.php
2012-12-04 10:09:44 UTC (rev 10569)
@@ -176,10 +176,17 @@
*
* @return array containing values from $array for the keys in
$keys.
*/
+
+ function getTimestamp($last){
+ $now = floor(microtime(true)*1000);
+ return $now-$last;
+ }
+
function building_schedule($building_id, $date)
{
- $from = clone $date;
+
+ $from = clone $date;
$from->setTime(0, 0, 0);
// Make sure $from is a monday
if($from->format('w') != 1)
@@ -197,6 +204,7 @@
$allocation['shortname'] =
$allocation['organization_shortname'];
$allocation['type'] = 'allocation';
}
+
$booking_ids =
$this->so->booking_ids_for_building($building_id, $from, $to);
$bookings = $this->so->read(array('filters'=>
array('id' => $booking_ids)));
$bookings = $bookings['results'];
@@ -205,7 +213,10 @@
$booking['name'] = $booking['group_name'];
$booking['shortname'] =
$booking['group_shortname'];
$booking['type'] = 'booking';
+ unset($booking['audience']);
+ unset($booking['agegroups']);
}
+
$allocations = $this->split_allocations($allocations,
$bookings);
$event_ids =
$this->so->event_ids_for_building($building_id, $from, $to);
@@ -213,9 +224,14 @@
$events = $events['results'];
foreach($events as &$event)
{
+
$event['name'] = $event['description'];
$event['type'] = 'event';
+ unset($event['comments']);
+ unset($event['audience']);
+ unset($event['agegroups']);
}
+
$bookings = array_merge($allocations, $bookings);
$bookings = $this->_remove_event_conflicts($bookings,
$events);
$bookings = array_merge($events, $bookings);
@@ -225,6 +241,7 @@
$resource_ids = array_merge($resource_ids,
$this->so->resource_ids_for_events($event_ids));
$resources = $this->resource_so->read(array('filters'
=> array('id' => $resource_ids, 'active' => 1)));
$resources = $resources['results'];
+
foreach ($resources as $key => $row) {
$sort[$key] = $row['sort'];
}
Modified: branches/Version-1_0-branch/controller/inc/hook_home.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/hook_home.inc.php
2012-12-04 10:06:40 UTC (rev 10568)
+++ branches/Version-1_0-branch/controller/inc/hook_home.inc.php
2012-12-04 10:09:44 UTC (rev 10569)
@@ -70,7 +70,8 @@
$styling .= "\n".'<!-- END checklist info -->'."\n";
echo $styling;
- echo "<script src='controller/js/controller/jquery.js'></script>";
+// echo "<script src='controller/js/controller/jquery.js'></script>";
+ echo "<script
src='phpgwapi/js/jquery/js/jquery-1.7.2.min.js'></script>";
$script = "<script>";
$script .= "$(document).ready(function(){";
Modified: branches/Version-1_0-branch/frontend/inc/class.bofellesdata.inc.php
===================================================================
--- branches/Version-1_0-branch/frontend/inc/class.bofellesdata.inc.php
2012-12-04 10:06:40 UTC (rev 10568)
+++ branches/Version-1_0-branch/frontend/inc/class.bofellesdata.inc.php
2012-12-04 10:09:44 UTC (rev 10569)
@@ -16,12 +16,31 @@
}
return self::$bo;
}
+
+ /* our simple php ping function */
+ function ping($host)
+ {
+ exec(sprintf('ping -c 1 -W 5 %s', escapeshellarg($host)), $res,
$rval);
+ return $rval === 0;
+ }
public function get_db()
{
+ if($this->db && is_object($this->db))
+ {
+ return $this->db;
+ }
+
$config = CreateObject('phpgwapi.config','rental');
$config->read();
+ if(! $config->config_data['external_db_host'] ||
!$this->ping($config->config_data['external_db_host']))
+ {
+ $message ="Database server
{$config->config_data['external_db_host']} is not accessible";
+ phpgwapi_cache::message_set($message, 'error');
+ return false;
+ }
+
$db = createObject('phpgwapi.db', null, null, true);
$db->debug =
!!$config->config_data['external_db_debug'];
@@ -40,9 +59,12 @@
}
catch(Exception $e)
{
+ phpgwapi_cache::message_set('Could not connect
to backend-server ' . $config->config_data['external_db_host'], 'error');
$GLOBALS['phpgw']->redirect_link('/home.php');
}
+ $this->db = $db;
return $db;
+
}
public function populate_result_units(array $unit_ids)
@@ -52,7 +74,10 @@
$columns = "V_ORG_ENHET.ORG_ENHET_ID,
V_ORG_ENHET.ORG_NAVN, V_ORG_ENHET.RESULTATENHET";
$table = "V_ORG_ENHET";
- $db = $this->get_db();
+ if(!$db = $this->get_db())
+ {
+ return;
+ }
$result_units = array();
@@ -115,8 +140,12 @@
$sql = "SELECT $columns FROM $table $joins WHERE
V_ORG_PERSON.BRUKERNAVN = '$username'";
- $db = $this->get_db();
- $db1 = $this->get_db();
+ if(!$db = $this->get_db())
+ {
+ return;
+ }
+
+ $db1 = clone($db);
//var_dump($db->Type);
if($db->Type == "postgres")
{
@@ -236,7 +265,11 @@
if(isset($number) && is_numeric($number))
{
$sql = "SELECT V_ORG_ENHET.ORG_NAVN FROM V_ORG_ENHET
WHERE V_ORG_ENHET.RESULTATENHET = $number";
- $db = $this->get_db();
+ if(!$db = $this->get_db())
+ {
+ return;
+ }
+
if($db->Type == "postgres")
{
$sql = strtolower($sql);
@@ -269,7 +302,11 @@
if(isset($number) && is_numeric($number))
{
$sql = "SELECT V_ORG_ENHET.ORG_NAVN,
V_ORG_ENHET.RESULTATENHET FROM V_ORG_ENHET WHERE V_ORG_ENHET.ORG_ENHET_ID =
$number";
- $db = $this->get_db();
+ if(!$db = $this->get_db())
+ {
+ return;
+ }
+
if($db->Type == "postgres")
{
$sql = strtolower($sql);
@@ -309,7 +346,11 @@
$this->log(__class__, __function__);
$sql = "SELECT BRUKERNAVN, FORNAVN, ETTERNAVN, EPOST FROM
V_AD_BRUKERE WHERE BRUKERNAVN = '{$username}'";
- $db = $this->get_db();
+ if(!$db = $this->get_db())
+ {
+ return;
+ }
+
if($db->Type == "postgres")
{
$sql = strtolower($sql);
Modified: branches/Version-1_0-branch/logistic/inc/class.sorequirement.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/inc/class.sorequirement.inc.php
2012-12-04 10:06:40 UTC (rev 10568)
+++ branches/Version-1_0-branch/logistic/inc/class.sorequirement.inc.php
2012-12-04 10:09:44 UTC (rev 10569)
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/
* @package property
* @subpackage logistic
- * @version $Id:$
+ * @version $Id$
*/
phpgw::import_class('logistic.socommon');
Property changes on:
branches/Version-1_0-branch/logistic/inc/class.sorequirement.inc.php
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Modified:
branches/Version-1_0-branch/logistic/inc/class.sorequirement_resource_allocation.inc.php
===================================================================
---
branches/Version-1_0-branch/logistic/inc/class.sorequirement_resource_allocation.inc.php
2012-12-04 10:06:40 UTC (rev 10568)
+++
branches/Version-1_0-branch/logistic/inc/class.sorequirement_resource_allocation.inc.php
2012-12-04 10:09:44 UTC (rev 10569)
@@ -25,7 +25,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/
* @package property
* @subpackage logistic
- * @version $Id: class.soproject.inc.php 10111 2012-10-04 08:53:35Z
erikhl $
+ * @version $Id$
*/
phpgw::import_class('logistic.socommon');
Property changes on:
branches/Version-1_0-branch/logistic/inc/class.sorequirement_resource_allocation.inc.php
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Modified:
branches/Version-1_0-branch/logistic/inc/class.sorequirement_value.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/inc/class.sorequirement_value.inc.php
2012-12-04 10:06:40 UTC (rev 10568)
+++ branches/Version-1_0-branch/logistic/inc/class.sorequirement_value.inc.php
2012-12-04 10:09:44 UTC (rev 10569)
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/
* @package property
* @subpackage logistic
- * @version $Id:$
+ * @version $Id$
*/
phpgw::import_class('logistic.socommon');
Property changes on:
branches/Version-1_0-branch/logistic/inc/class.sorequirement_value.inc.php
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Modified:
branches/Version-1_0-branch/logistic/inc/class.soresource_type_requirement.inc.php
===================================================================
---
branches/Version-1_0-branch/logistic/inc/class.soresource_type_requirement.inc.php
2012-12-04 10:06:40 UTC (rev 10568)
+++
branches/Version-1_0-branch/logistic/inc/class.soresource_type_requirement.inc.php
2012-12-04 10:09:44 UTC (rev 10569)
@@ -25,7 +25,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/
* @package property
* @subpackage logistic
- * @version $Id: class.soproject.inc.php 10111 2012-10-04 08:53:35Z
erikhl $
+ * @version $Id$
*/
phpgw::import_class('logistic.socommon');
Property changes on:
branches/Version-1_0-branch/logistic/inc/class.soresource_type_requirement.inc.php
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Modified: branches/Version-1_0-branch/logistic/inc/class.uiactivity.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/inc/class.uiactivity.inc.php
2012-12-04 10:06:40 UTC (rev 10568)
+++ branches/Version-1_0-branch/logistic/inc/class.uiactivity.inc.php
2012-12-04 10:09:44 UTC (rev 10569)
@@ -410,13 +410,14 @@
{
$activity_id = phpgw::get_var('id');
$parent_activity_id = phpgw::get_var('parent_id',
'int');
- $project_id = phpgw::get_var('project_id');
+ $project_id = phpgw::get_var('project_id', 'int');
if($activity == null)
{
if( $activity_id && is_numeric($activity_id) )
{
$activity =
$this->so->get_single($activity_id);
+ $project_id =
$activity->get_project_id();
}
else
{
@@ -553,6 +554,7 @@
$activity->populate();
+//_debug_array($activity);die();
if( $activity->validate() )
{
$activity_id = $this->so->store($activity);
Property changes on:
branches/Version-1_0-branch/logistic/inc/class.uirequirement.inc.php
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Modified:
branches/Version-1_0-branch/logistic/inc/class.uirequirement_resource_allocation.inc.php
===================================================================
---
branches/Version-1_0-branch/logistic/inc/class.uirequirement_resource_allocation.inc.php
2012-12-04 10:06:40 UTC (rev 10568)
+++
branches/Version-1_0-branch/logistic/inc/class.uirequirement_resource_allocation.inc.php
2012-12-04 10:09:44 UTC (rev 10569)
@@ -25,7 +25,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/
* @package property
* @subpackage logistic
- * @version $Id: class.uiactivity.inc.php 10101 2012-10-03 09:46:51Z
vator $
+ * @version $Id$
*/
phpgw::import_class('phpgwapi.uicommon');
phpgw::import_class('logistic.soactivity');
Property changes on:
branches/Version-1_0-branch/logistic/inc/class.uirequirement_resource_allocation.inc.php
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/logistic/inc/class.uiresource_type_requirement.inc.php
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Modified: branches/Version-1_0-branch/logistic/inc/model/class.activity.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/inc/model/class.activity.inc.php
2012-12-04 10:06:40 UTC (rev 10568)
+++ branches/Version-1_0-branch/logistic/inc/model/class.activity.inc.php
2012-12-04 10:09:44 UTC (rev 10569)
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/
* @package property
* @subpackage logistic
- * @version $Id $
+ * @version $Id$
*/
include_class('logistic', 'model', '/inc/model/');
@@ -42,7 +42,7 @@
protected $end_date;
protected $responsible_user_id;
protected $create_user;
- protected $create_date;
+ protected $create_date;
protected $update_user;
protected $update_date;
@@ -246,20 +246,21 @@
public function populate()
{
- $this->set_id( phpgw::get_var('id', 'int') );
+ $this->set_id( phpgw::get_var('id','POST', 'int') );
$this->set_name( phpgw::get_var('name') );
- $this->set_responsible_user_id(
phpgw::get_var('responsible_user_id', 'int') );
+ $this->set_responsible_user_id(
phpgw::get_var('responsible_user_id','POST', 'int') );
$this->set_description( phpgw::get_var('description') );
- if( $parent_id = phpgw::get_var('parent_activity_id',
'int') )
+ if( isset($_POST['parent_activity_id']))
{
- $this->set_parent_id( $parent_id );
+ $activity_id =
phpgw::get_var('parent_activity_id','POST', 'int');
+ $this->set_parent_id( $activity_id ?
$activity_id : '' );
}
else
{
- $this->set_parent_id(
phpgw::get_var('parent_id', 'int') );
+ $this->set_parent_id(
phpgw::get_var('parent_id','POST', 'int') );
}
- $this->set_project_id( phpgw::get_var('project_id',
'int') );
+ $this->set_project_id(
phpgw::get_var('project_id','POST', 'int') );
$user_id = $GLOBALS['phpgw_info']['user']['id'];
$this->set_update_user( $user_id );
@@ -268,15 +269,15 @@
$this->set_create_user( $user_id );
}
- if(phpgw::get_var('start_date','string') != '')
+ if(phpgw::get_var('start_date','POST','string') != '')
{
- $start_date_ts =
phpgwapi_datetime::date_to_timestamp( phpgw::get_var('start_date','string') );
+ $start_date_ts =
phpgwapi_datetime::date_to_timestamp(
phpgw::get_var('start_date','POST','string') );
$this->set_start_date($start_date_ts);
}
- if( phpgw::get_var('end_date','string') != '')
+ if( phpgw::get_var('end_date','POST','string') != '')
{
- $end_date_ts =
phpgwapi_datetime::date_to_timestamp( phpgw::get_var('end_date','string') );
+ $end_date_ts =
phpgwapi_datetime::date_to_timestamp(
phpgw::get_var('end_date','POST','string') );
$this->set_end_date($end_date_ts);
}
}
Property changes on:
branches/Version-1_0-branch/logistic/inc/model/class.requirement.inc.php
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/logistic/inc/model/class.requirement_resource_allocation.inc.php
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/logistic/inc/model/class.requirement_value.inc.php
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/logistic/inc/model/class.resource_type_requirement.inc.php
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/logistic/js/logistic/activity.js
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Property changes on: branches/Version-1_0-branch/logistic/js/logistic/ajax.js
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Property changes on: branches/Version-1_0-branch/logistic/js/logistic/project.js
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/logistic/js/logistic/requirement.js
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/logistic/js/logistic/resource_allocation.js
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/logistic/js/logistic/resource_type_requirement.js
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/logistic/setup/tables_update.inc.php
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Modified:
branches/Version-1_0-branch/logistic/templates/base/activity/activity_tabs.xsl
===================================================================
---
branches/Version-1_0-branch/logistic/templates/base/activity/activity_tabs.xsl
2012-12-04 10:06:40 UTC (rev 10568)
+++
branches/Version-1_0-branch/logistic/templates/base/activity/activity_tabs.xsl
2012-12-04 10:09:44 UTC (rev 10569)
@@ -1,4 +1,4 @@
-<!-- $Id: control_tabs.xsl 9951 2012-08-31 10:14:12Z vator $ -->
+<!-- $Id$ -->
<!-- separate tabs and inline tables-->
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
Property changes on:
branches/Version-1_0-branch/logistic/templates/base/activity/activity_tabs.xsl
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Modified:
branches/Version-1_0-branch/logistic/templates/base/activity/add_activity_item.xsl
===================================================================
---
branches/Version-1_0-branch/logistic/templates/base/activity/add_activity_item.xsl
2012-12-04 10:06:40 UTC (rev 10568)
+++
branches/Version-1_0-branch/logistic/templates/base/activity/add_activity_item.xsl
2012-12-04 10:09:44 UTC (rev 10569)
@@ -23,6 +23,13 @@
</h1>
</xsl:otherwise>
</xsl:choose>
+
+
+ <xsl:choose>
+ <xsl:when test="breadcrumb != ''">
+ <xsl:call-template name="breadcrumb" />
+ </xsl:when>
+ </xsl:choose>
<div id="activity_details" class="content-wrp">
<div id="details">
@@ -43,7 +50,7 @@
<div
style="margin-bottom: 1em;">
<label style="display:block;"><xsl:value-of select="php:function('lang',
'Choose another main activity for this sub activity')" /></label>
<select id="select_parent_activity" name="parent_activity_id">
-
<option value="">Velg annen hovedaktivitet</option>
+
<option value="0">Velg annen hovedaktivitet</option>
<xsl:for-each select="activities">
<option
value="{id}">
<xsl:if test="id = $parent_id">
@@ -78,28 +85,30 @@
</div>
</dt>
</xsl:when>-->
- <xsl:otherwise>
- <dt>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when
test="projects != ''">
+ <dt>
<div
style="margin-bottom: 1em;">
<label style="display:block;"><xsl:value-of select="php:function('lang',
'Choose another project for the activity')" /></label>
<select id="select_project" name="select_project"
formvalidator:FormField="yes"
formvalidator:Type="SelectField">
<option value=''><xsl:value-of select="php:function('lang', 'Choose
another project')" /></option>
-
<xsl:for-each select="projects">
- <option
value="{id}">
-
<xsl:if test="project/id = project_id">
-
<xsl:attribute name="selected">
-
selected
-
</xsl:attribute>
-
</xsl:if>
-
<xsl:value-of disable-output-escaping="yes" select="name"/>
-
</option>
-
</xsl:for-each>
+
<xsl:for-each select="projects">
+
<option value="{id}">
+
<xsl:if test="project/id = project_id">
+
<xsl:attribute name="selected">
+
selected
+
</xsl:attribute>
+
</xsl:if>
+
<xsl:value-of disable-output-escaping="yes"
select="name"/>
+
</option>
+
</xsl:for-each>
</select>
</div>
</dt>
- </xsl:otherwise>
+ </xsl:when>
</xsl:choose>
<dt>
<label for="name"><xsl:value-of
select="php:function('lang','Activity name')" /></label>
@@ -264,3 +273,27 @@
<xsl:value-of disable-output-escaping="yes" select="name"/>
</option>
</xsl:template>
+
+<!-- =========== BREADCRUMB TEMPLATE ============== -->
+<xsl:template name="breadcrumb">
+ <div id="breadcrumb">
+ <span class="intro">Du er her:</span>
+ <xsl:for-each select="breadcrumb">
+ <xsl:choose>
+ <xsl:when test="current = 1">
+ <span class="current">
+ <xsl:value-of select="name"/>
+ </span>
+ </xsl:when>
+ <xsl:otherwise>
+ <a href="{link}">
+ <xsl:value-of select="name"/>
+ </a>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:if test="not( position() = last() )">
+ <img src="logistic/images/arrow_right.png" />
+ </xsl:if>
+ </xsl:for-each>
+ </div>
+</xsl:template>
Property changes on:
branches/Version-1_0-branch/logistic/templates/base/activity/add_activity_item.xsl
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/logistic/templates/base/activity/view_activity_item.xsl
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/logistic/templates/base/allocation/book_resources.xsl
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Modified: branches/Version-1_0-branch/logistic/templates/base/css/base.css
===================================================================
--- branches/Version-1_0-branch/logistic/templates/base/css/base.css
2012-12-04 10:06:40 UTC (rev 10568)
+++ branches/Version-1_0-branch/logistic/templates/base/css/base.css
2012-12-04 10:09:44 UTC (rev 10569)
@@ -104,15 +104,28 @@
width: 33em;
height: 10em;
}
+
dl.form dd input[type="text"], dl.form dd .autocomplete,
dl.form-col dd input[type="text"], dl.form-col dd .autocomplete {
- width: 15em;
+ width: 15em;
}
dl.form dd .autocomplete,
-dl.form-col dd .autocomplete {
- padding-bottom: 2em;
+dl.form-col dd .autocomplete,
+dl.form-2col dd .autocomplete {
+ padding-bottom: 2em;
}
+div.autocomplete {
+ width: 15em;
+ position: relative;
+ padding-bottom: 2em;
+}
+/* ie fix. autocomplete dropdown is displayed behind some elements if the
z-index is not set */
+div.autocomplete input {
+ z-index: 500;
+}
+
+
dl.form dt.heading, dl.form-col dt.heading {
color: #448;
font-weight: normal;
@@ -148,7 +161,7 @@
padding-top: 1em;
}
-.form-buttons input[type=submit]{
+.form-buttons input[type=submit], input[type="button"]{
margin-right: 5px;
}
Property changes on:
branches/Version-1_0-branch/logistic/templates/base/project/resource_type_requirement_item.xsl
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/logistic/templates/base/requirement/requirement_item.xsl
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/logistic/templates/base/requirement/requirement_overview.xsl
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Modified:
branches/Version-1_0-branch/logistic/templates/base/requirement/requirement_tabs.xsl
===================================================================
---
branches/Version-1_0-branch/logistic/templates/base/requirement/requirement_tabs.xsl
2012-12-04 10:06:40 UTC (rev 10568)
+++
branches/Version-1_0-branch/logistic/templates/base/requirement/requirement_tabs.xsl
2012-12-04 10:09:44 UTC (rev 10569)
@@ -1,4 +1,4 @@
-<!-- $Id: control_tabs.xsl 9951 2012-08-31 10:14:12Z vator $ -->
+<!-- $Id$ -->
<!-- separate tabs and inline tables-->
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
Property changes on:
branches/Version-1_0-branch/logistic/templates/base/requirement/requirement_tabs.xsl
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Property changes on:
branches/Version-1_0-branch/logistic/templates/base/requirement/requirement_values.xsl
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.js.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.js.inc.php 2012-12-04
10:06:40 UTC (rev 10568)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.js.inc.php 2012-12-04
10:09:44 UTC (rev 10569)
@@ -128,6 +128,12 @@
public function get_script_links()
{
$combine = true;
+
+ if
(isset($GLOBALS['phpgw_info']['server']['no_jscombine']) &&
$GLOBALS['phpgw_info']['server']['no_jscombine'])
+ {
+ $combine = false;
+ }
+
if(ini_get('suhosin.get.max_value_length') &&
ini_get('suhosin.get.max_value_length') < 2000)
{
$combine = false;
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.sbox.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.sbox.inc.php 2012-12-04
10:06:40 UTC (rev 10568)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.sbox.inc.php 2012-12-04
10:09:44 UTC (rev 10569)
@@ -543,4 +543,3 @@
);
}
}
-?>
Modified: branches/Version-1_0-branch/property/inc/class.bolocation.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.bolocation.inc.php
2012-12-04 10:06:40 UTC (rev 10568)
+++ branches/Version-1_0-branch/property/inc/class.bolocation.inc.php
2012-12-04 10:09:44 UTC (rev 10569)
@@ -257,12 +257,18 @@
{
switch($data['lookup_type'])
{
- case 'form':
-
$GLOBALS['phpgw']->xslttpl->add_file(array('location_form'),ExecMethod('phpgwapi.phpgw.common.get_tpl_dir',
'property'));
- break;
- case 'view':
-
$GLOBALS['phpgw']->xslttpl->add_file(array('location_view'),ExecMethod('phpgwapi.phpgw.common.get_tpl_dir',
'property'));
- break;
+ case 'form':
+
$GLOBALS['phpgw']->xslttpl->add_file(array('location_form'),ExecMethod('phpgwapi.phpgw.common.get_tpl_dir',
'property'));
+ break;
+ case 'view':
+
$GLOBALS['phpgw']->xslttpl->add_file(array('location_view'),ExecMethod('phpgwapi.phpgw.common.get_tpl_dir',
'property'));
+ break;
+ case 'form2':
+
$GLOBALS['phpgw']->xslttpl->add_file(array('location_form2'),ExecMethod('phpgwapi.phpgw.common.get_tpl_dir',
'property'));
+ break;
+ case 'view2':
+
$GLOBALS['phpgw']->xslttpl->add_file(array('location_view2'),ExecMethod('phpgwapi.phpgw.common.get_tpl_dir',
'property'));
+ break;
}
}
@@ -308,6 +314,7 @@
$location['location'][$i]['name']
= $location_types[($i)]['name'];
$location['location'][$i]['value']
= isset($data['values']['loc' . ($i+1)]) ?
$data['values']['loc' . ($i+1)] : '';
$location['location'][$i]['statustext']
= lang('click this link to select') . ' ' .
$location_types[($i)]['name'];
+ $location['location'][$i]['required']
= isset($data['required_level']) && $data['required_level'] ==
($i+1);
$location['location'][$i]['extra'][0]['input_name'] = 'loc' .
($i+1).'_name';
$input_name[]
= $location['location'][$i]['extra'][0]['input_name'];
@@ -605,7 +612,8 @@
if(isset($lookup_functions) &&
is_array($lookup_functions))
{
- $location['lookup_functions'] = '';
+ $_lookup_functions =
"self.name='first_Window'\n";
+
$filter_level = 0;
for ($j=0;$j<count($lookup_functions);$j++)
{
@@ -624,14 +632,14 @@
$lookup_functions[$j]['link']
.= ",location_code:'{$filter_location}',block_query:'{$block_query}'";
}
- $location['lookup_functions'] .= <<<JS
+ $_lookup_functions .= <<<JS
function
{$lookup_functions[$j]['name']}
{
JS;
if($filter_level)
{
- $location['lookup_functions']
.= <<<JS
+ $_lookup_functions .= <<<JS
var block = '';
var filter = '';
@@ -656,7 +664,7 @@
}
JS;
}
- $location['lookup_functions'] .= <<<JS
+ $_lookup_functions .= <<<JS
var oArgs =
{{$lookup_functions[$j]['link']}};
var strURL =
phpGWLink('index.php', oArgs);
@@ -666,6 +674,8 @@
}
}
+ $GLOBALS['phpgw']->js->add_code('', $_lookup_functions);
+
if(isset($location) && is_array($location))
{
for ($i=0;$i<count($location['location']);$i++)
Modified:
branches/Version-1_0-branch/property/inc/class.uicondition_survey.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uicondition_survey.inc.php
2012-12-04 10:06:40 UTC (rev 10568)
+++ branches/Version-1_0-branch/property/inc/class.uicondition_survey.inc.php
2012-12-04 10:09:44 UTC (rev 10569)
@@ -1,7 +1,7 @@
<?php
/**
- * phpGroupWare - logistic: a part of a Facilities Management System.
+ * phpGroupWare - property: a part of a Facilities Management System.
*
* @author Sigurd Nes <address@hidden>
* @copyright Copyright (C) 2012 Free Software Foundation, Inc.
http://www.fsf.org/
@@ -45,7 +45,10 @@
'save' => true,
'get_vendors' => true,
'get_users' => true,
- 'edit_survey_title' => true
+ 'edit_survey_title' => true,
+ 'get_files' => true,
+ 'view_file' => true,
+ 'import' => true
);
public function __construct()
@@ -63,7 +66,6 @@
$this->acl_manage =
$this->acl->check($this->acl_location, 16, 'property');
$GLOBALS['phpgw_info']['flags']['menu_selection'] =
"property::condition_survey";
-
$GLOBALS['phpgw']->css->add_external_file('logistic/templates/base/css/base.css');
}
@@ -215,7 +217,7 @@
$export = phpgw::get_var('export');
$values = $this->bo->read($params);
-//_debug_array($values);
+
// ... add result data
$result_data = array('results' => $values);
@@ -250,9 +252,19 @@
$this->edit();
}
+ /**
+ * Prepare data for view and edit - depending on mode
+ *
+ * @param array $values populated object in case of retry
+ * @param string $mode edit or view
+ * @param int $id entity id - no id means 'new'
+ *
+ * @return void
+ */
+
public function edit($values = array(), $mode = 'edit')
{
- $id = phpgw::get_var('id', 'int');
+ $id = (int)phpgw::get_var('id');
if(!$this->acl_add && !$this->acl_edit)
{
@@ -285,8 +297,11 @@
if ($id)
{
+ if($mode == 'edit')
+ {
+ $tabs['import']['link'] = '#import';
+ }
$tabs['documents']['link'] = '#documents';
- $tabs['import']['link'] = '#import';
if (!$values)
{
@@ -306,8 +321,9 @@
(
'values' =>
$values['location_data'],
'type_id' => 2,
+ 'required_level' => 1,
'no_link' => $_no_link, //
disable lookup links for location type less than type_id
- 'lookup_type' => $mode == 'edit' ?
'form' : 'view',
+ 'lookup_type' => $mode == 'edit' ?
'form2' : 'view2',
'tenant' => false,
'lookup_entity' => array(),
'entity_data' =>
isset($values['p'])?$values['p']:''
@@ -315,39 +331,66 @@
$msgbox_data =
$this->bocommon->msgbox_data($this->receipt);
+ $file_def = array
+ (
+ array('key' =>
'file_name','label'=>lang('Filename'),'sortable'=>false,'resizeable'=>true),
+ array('key' =>
'delete_file','label'=>lang('Delete
file'),'sortable'=>false,'resizeable'=>true,'formatter'=>'FormatterCenter'),
+ );
+
+
+ $datatable_def = array();
+ $datatable_def[] = array
+ (
+ 'container' =>
'datatable-container_0',
+ 'requestUrl' =>
json_encode(self::link(array('menuaction' =>
'property.uicondition_survey.get_files', 'id' =>
$id,'phpgw_return_as'=>'json'))),
+ 'ColumnDefs' => json_encode($file_def),
+
+ );
+
$data = array
(
- 'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
- 'survey' => $values,
- 'location_data' => $location_data,
- 'categories' => array('options' =>
$categories),
- 'status_list' => array('options' =>
execMethod('property.bogeneric.get_list',array('type' =>
'condition_survey_status', 'selected' => $values['status_id'], 'add_empty' =>
true))),
- 'editable' => $mode ==
'edit',
- 'tabs' =>
phpgwapi_yui::tabview_generate($tabs, $active_tab),
- 'fileupload'
=> true,
- 'multiple_uploader'
=> true,
- 'fileuploader_action' =>
"{menuaction:'property.fileuploader.add',"
-
."upload_target:'property.bocondition_survey.addfiles',"
-
."id:'{$id}'}",
+ 'datatable_def'
=> $datatable_def,
+ 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
+ 'survey'
=> $values,
+ 'location_data2'
=> $location_data,
+ 'categories'
=> array('options' => $categories),
+ 'status_list'
=> array('options' => execMethod('property.bogeneric.get_list',array('type' =>
'condition_survey_status', 'selected' => $values['status_id'], 'add_empty' =>
true))),
+ 'editable'
=> $mode == 'edit',
+ 'tabs'
=> phpgwapi_yui::tabview_generate($tabs, $active_tab),
+ 'multiple_uploader'
=> $mode == 'edit' ? true : '',
);
-//_debug_array($data);die();
- $GLOBALS['phpgw']->jqcal->add_listener('report_date');
+
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('property') . '::' . lang('condition survey');
- phpgwapi_jquery::load_widget('core');
- self::add_javascript('property', 'portico',
'condition_survey_edit.js');
- self::add_javascript('phpgwapi', 'yui3',
'yui/yui-min.js');
- self::add_javascript('phpgwapi', 'yui3',
'gallery-formvalidator/gallery-formvalidator-min.js');
-
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yui3/gallery-formvalidator/validatorCss.css');
- self::add_javascript('phpgwapi', 'tinybox2',
'packed.js');
-
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/tinybox2/style.css');
+ if($mode == 'edit')
+ {
+
$GLOBALS['phpgw']->jqcal->add_listener('report_date');
+ phpgwapi_jquery::load_widget('core');
+ self::add_javascript('property', 'portico',
'condition_survey_edit.js');
+ self::add_javascript('phpgwapi', 'yui3',
'yui/yui-min.js');
+ self::add_javascript('phpgwapi', 'yui3',
'gallery-formvalidator/gallery-formvalidator-min.js');
+
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yui3/gallery-formvalidator/validatorCss.css');
+ self::add_javascript('phpgwapi', 'tinybox2',
'packed.js');
+
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/tinybox2/style.css');
+ }
-
self::render_template_xsl(array('condition_survey','files'), $data);
+// $GLOBALS['phpgw_info']['server']['no_jscombine'] = true;
+
+ self::render_template_xsl(array('condition_survey'),
$data);
}
+
+ /**
+ * Saves an entry to the database for new/edit - redirects to
view
+ *
+ * @param int $id entity id - no id means 'new'
+ *
+ * @return void
+ */
+
public function save()
{
- $id = phpgw::get_var('id');
+ $id = (int)phpgw::get_var('id');
if ($id )
{
@@ -385,11 +428,378 @@
}
}
- phpgwapi_cache::message_set('ok!', 'message');
- $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'property.uicondition_survey.view', 'id' => $id));
+ $this->_handle_files($id);
+ if($_FILES['import_file']['tmp_name'])
+ {
+ $this->_handle_import($id);
+ }
+ else
+ {
+ phpgwapi_cache::message_set('ok!',
'message');
+
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction' =>
'property.uicondition_survey.view', 'id' => $id));
+ }
}
}
+ /**
+ * Fetch a list of files to be displayed in view/edit
+ *
+ * @param int $id entity id
+ *
+ * @return array $ResultSet json resultset
+ */
+
+ public function get_files()
+ {
+ $id = phpgw::get_var('id', 'REQUEST', 'int');
+
+ if( !$this->acl_read)
+ {
+ return;
+ }
+
+ $link_file_data = array
+ (
+ 'menuaction' =>
'property.uicondition_survey.view_file',
+ 'id' => $id
+ );
+
+
+ $link_view_file = self::link($link_file_data);
+
+ $vfs = CreateObject('phpgwapi.vfs');
+ $vfs->override_acl = 1;
+
+ $files = $vfs->ls(array(
+ 'string' => "/property/condition_survey/{$id}",
+ 'relatives' => array(RELATIVE_NONE)));
+
+ $vfs->override_acl = 0;
+
+
+ $lang_view = lang('click to view file');
+ $lang_delete = lang('click to delete file');
+
+ $values = array();
+ foreach($files as $_entry )
+ {
+ $values[] = array
+ (
+ 'file_name' => "<a
href='{$link_view_file}&file_name={$_entry['name']}' target='_blank'
title='{$lang_view}'>{$_entry['name']}</a>",
+ 'delete_file' => "<input
type='checkbox' name='values[file_action][]' value='{$_entry['name']}'
title='$lang_delete'>",
+ );
+ }
+
+ return array('ResultSet'=> array('Result'=>$values),
'totalResultsAvailable' => count($values));
+ }
+
+
+ /**
+ * Dowloads a single file to the browser
+ *
+ * @param int $id entity id
+ *
+ * @return file
+ */
+
+ function view_file()
+ {
+ if(!$this->acl_read)
+ {
+ return lang('no access');
+ }
+
+ $bofiles = CreateObject('property.bofiles');
+ $bofiles->view_file('condition_survey');
+ }
+
+
+ /**
+ * Store and / or delete files related to an entity
+ *
+ * @param int $id entity id
+ *
+ * @return void
+ */
+ private function _handle_files($id)
+ {
+ $id = (int)$id;
+ if(!$id)
+ {
+ throw new
Exception('uicondition_survey::_handle_files() - missing id');
+ }
+ $bofiles = CreateObject('property.bofiles');
+ if(isset($_POST['file_action']) &&
is_array($_POST['file_action']))
+ {
+
$bofiles->delete_file("/condition_survey/{$id}/", array('file_action' =>
$_POST['file_action']));
+ }
+ $file_name=str_replace(' ','_',$_FILES['file']['name']);
+
+ if($file_name)
+ {
+ $to_file = $bofiles->fakebase .
'/condition_survey/' . $id . '/' . $file_name;
+ if($bofiles->vfs->file_exists(array(
+ 'string' => $to_file,
+ 'relatives' => Array(RELATIVE_NONE)
+ )))
+ {
+ phpgwapi_cache::message_set(lang('This
file already exists !'), 'error');
+ }
+ else
+ {
+
$bofiles->create_document_dir("condition_survey/{$id}");
+ $bofiles->vfs->override_acl = 1;
+
+ if(!$bofiles->vfs->cp (array (
+ 'from' =>
$_FILES['file']['tmp_name'],
+ 'to' => $to_file,
+ 'relatives' => array
(RELATIVE_NONE|VFS_REAL, RELATIVE_ALL))))
+ {
+
phpgwapi_cache::message_set(lang('Failed to upload file !'), 'error');
+ }
+ $bofiles->vfs->override_acl = 0;
+ }
+ }
+ }
+
+
+
+ public function import()
+ {
+ $id = phpgw::get_var('id', 'REQUEST', 'int');
+ $this->_handle_import($id);
+ }
+
+ /**
+ * Import deviations found in the survey to the database from a
spreadsheet
+ *
+ * @param int $id entity id
+ *
+ * @return void
+ */
+ private function _handle_import($id)
+ {
+ $id = (int)$id;
+ if(!$id)
+ {
+ throw new
Exception('uicondition_survey::_handle_import() - missing id');
+ }
+
+ $step = phpgw::get_var('step',
'REQUEST', 'int');
+ $sheet_id = phpgw::get_var('sheet_id',
'REQUEST', 'int');
+
+ $sheet_id = $sheet_id ? $sheet_id :
phpgw::get_var('selected_sheet_id', 'REQUEST', 'int');
+ $start_line = phpgw::get_var('start_line',
'REQUEST', 'int', 1);
+
+ if(!$cached_file =
phpgwapi_cache::session_get('property', 'condition_survey_import_file'))
+ {
+ $file = $_FILES['import_file']['tmp_name'];
+ $cached_file ="{$file}_temporary_import_file";
+ // save a copy to survive multiple steps
+ file_put_contents($cached_file,
file_get_contents($file));
+ phpgwapi_cache::session_set('property',
'condition_survey_import_file',$cached_file);
+ }
+
+//_debug_array($_POST);die();
+ phpgw::import_class('phpgwapi.phpexcel');
+
+ $objPHPExcel = PHPExcel_IOFactory::load($cached_file);
+ $AllSheets = $objPHPExcel->getSheetNames();
+
+ $sheets = array();
+ if($AllSheets)
+ {
+ foreach ($AllSheets as $key => $sheet)
+ $sheets[] = array
+ (
+ 'id' => $key,
+ 'name' => $sheet,
+ 'selected' => $sheet_id == $key
+ );
+ }
+
+
+//_debug_array($cached_file);
+//_debug_array($AllSheets);die();
+
+
+
+// phpgwapi_yui::tabview_setup('survey_edit_tabview');
+ $tabs = array();
+
+ switch ($step)
+ {
+ case 0:
+ $active_tab = 'step_1';
+ $tabs['step_1'] = array('label' =>
lang('step_1'), 'link' => '#step_1');
+ $tabs['step_2'] = array('label' =>
lang('step_2'), 'link' => null);
+ $tabs['step_3'] = array('label' =>
lang('step_3'), 'link' => null);
+ break;
+ case 1:
+ $active_tab = 'step_2';
+ $tabs['step_1'] = array('label' =>
lang('step_1'), 'link' => self::link(array('menuaction' =>
'property.uicondition_survey.import', 'id' =>$id, 'step' => 0, 'sheet_id' =>
$sheet_id, 'start_line' => $start_line )));
+ $tabs['step_2'] = array('label' =>
lang('step_2'), 'link' => '#step_2');
+ $tabs['step_3'] = array('label' =>
lang('step_3'), 'link' => null);
+ break;
+ case 2:
+ $active_tab = 'step_3';
+ $tabs['step_1'] = array('label' =>
lang('step_1'), 'link' => self::link(array('menuaction' =>
'property.uicondition_survey.import', 'id' =>$id, 'step' => 0, 'sheet_id' =>
$sheet_id, 'start_line' => $start_line )));
+ $tabs['step_2'] = array('label' =>
lang('step_2'), 'link' => self::link(array('menuaction' =>
'property.uicondition_survey.import', 'id' =>$id, 'step' => 1, 'sheet_id' =>
$sheet_id, 'start_line' => $start_line )));
+ $tabs['step_3'] = array('label' =>
lang('step_3'), 'link' => '#step_3');
+ break;
+ }
+
+//-----------
+
+
+ $objPHPExcel->setActiveSheetIndex((int)$sheet_id);
+
+ $data =
$objPHPExcel->getActiveSheet()->toArray(null,true,true,true);
+ $html_table = '<table border="1">';
+ if($data && $step == 1)
+ {
+ $i = 0;
+ $html_table .= "<tr><th align = 'center'>".
lang('start'). "</th><th align='center'>" . implode("</th><th align='center'>",
array_keys($data[1])) . '</th></tr>';
+ foreach($data as $row_key => $row)
+ {
+ if($i>20)
+ {
+ break;
+ }
+
+ $_checked = '';
+ if($start_line == $row_key)
+ {
+ $_checked = 'checked="checked"';
+ }
+
+ $_radio = "[{$row_key}]<input
id=\"start_line\" type =\"radio\" {$_checked} name=\"start_line\"
value=\"{$row_key}\">";
+
+ $html_table .=
"<tr><td><pre>{$_radio}</pre></td><td>" . implode('</td><td>',
array_values($row)) . '</td></tr>';
+ $i++;
+ }
+ }
+ else if($data && $step == 2)
+ {
+ $_options = array
+ (
+ 'Felt_1',
+ 'Felt_2',
+ 'Felt_3',
+ 'Felt_4',
+ 'Felt_5',
+ 'Felt_6',
+ );
+
+
+ /*
+ * Create a generic select list
+ *
+ * @param string $name string with name of the submitted var
which holds the key of the selected item form array
+ * @param array $selected key(s) of already selected item(s)
from $options, eg. '1' or '1,2' or array with keys
+ * @param array $options items to populate the <options>
+ * @param bool $no_lang by default all values are translated by
calls to lang(), setting this to true disbales it
+ * @param string $attribs additional html attributed to be
applied to <select>
+ * @param int $multiple the height of the <select>, if greater
than 1, set to 1 to just enable multiple selections
+ * @return string the populated html select element
+ */
+ phpgw::import_class('phpgwapi.sbox');
+
+ foreach($data[$start_line] as $_column =>
$_value)
+ {
+ $_listbox =
phpgwapi_sbox::getArrayItem($_column, $selected= 'Felt_6', $_options, true );
+
+ $_checkbox = "<input id=\"start_line\"
type =\"checkbox\" {$_checked} name=\"column\" value=\"{$_column}\">";
+ $html_table .= "<tr><td>[{$_column}]
{$_value}</td><td>{$_listbox}</td><tr>";
+ }
+ }
+
+ $html_table .= '</table>';
+
+
+
+
+
+//
+ $values = $this->bo->read_single( array('id' => $id,
'view' => $mode == 'view') );
+
+ if(isset($values['location_code']) &&
$values['location_code'])
+ {
+ $values['location_data'] =
execMethod('property.solocation.read_single', $values['location_code']);
+ }
+
+ $bolocation = CreateObject('property.bolocation');
+ $location_data = $bolocation->initiate_ui_location(array
+ (
+ 'values' =>
$values['location_data'],
+ 'type_id' => 2,
+ 'lookup_type' => 'view2',
+ 'tenant' => false,
+ 'lookup_entity' => array(),
+ 'entity_data' =>
isset($values['p'])?$values['p']:''
+ ));
+//
+
+ $data = array
+ (
+ 'survey'
=> $values,
+ 'location_data2'
=> $location_data,
+ 'step'
=> $step +1,
+ 'sheet_id'
=> $sheet_id,
+ 'start_line'
=> $start_line,
+ 'html_table'
=> $html_table,
+ 'sheets'
=> array('options' => $sheets),
+ // 'tabs'
=> phpgwapi_yui::tabview_generate($tabs, $active_tab),
+ 'tabs'
=>$GLOBALS['phpgw']->common->create_tabs($tabs, $active_tab),
+ );
+
+//_debug_array($data);die();
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('property') . '::' . lang('condition survey import');
+
+
self::render_template_xsl(array('condition_survey_import'), $data);
+
+
+//_debug_array($html_table);
+
+return;
+
+
+ $start = 1; // Where to start
+
+ $fields = array_values($data[($start-1)]);
+
+ $rows = count($data)+1;
+
+ $result = array();
+
+ for ($i=$start; $i<$rows; $i++ )
+ {
+ $_result = array();
+ $j=0;
+ foreach($data[$i] as $key => $value)
+ {
+ $_result[$j] = trim($value);
+ $j++;
+ }
+ $result[] = $_result;
+ }
+
+ $msg = "'{$path}' contained " . count($result) . "
lines";
+
+_debug_array($msg);
+_debug_array($result);die();
+
+ }
+
+
+ /**
+ * Gets user candidates to be used as coordinator - called as
ajax from edit form
+ *
+ * @param string $query
+ *
+ * @return array
+ */
+
public function get_users()
{
if(!$this->acl_read)
@@ -416,6 +826,14 @@
return array('ResultSet'=> array('Result'=>$values));
}
+ /**
+ * Gets vendor canidated to be used as vendor - called as ajax
from edit form
+ *
+ * @param string $query
+ *
+ * @return array
+ */
+
public function get_vendors()
{
if(!$this->acl_read)
@@ -434,6 +852,14 @@
return array('ResultSet'=> array('Result'=>$values));
}
+ /**
+ * Edit title fo entity directly from table
+ *
+ * @param int $id id of entity
+ * @param string $value new title of entity
+ *
+ * @return string text to appear in ui as receipt on action
+ */
public function edit_survey_title()
{
Modified: branches/Version-1_0-branch/property/inc/class.uitts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uitts.inc.php
2012-12-04 10:06:40 UTC (rev 10568)
+++ branches/Version-1_0-branch/property/inc/class.uitts.inc.php
2012-12-04 10:09:44 UTC (rev 10569)
@@ -2391,7 +2391,7 @@
$receipt = $this->bo->mail_ticket($id,
$this->bo->fields_updated, $receipt,'', false, isset($values['send_mail']) &&
$values['send_mail'] ? true : false);
}
- //--------- files
+ //--------- files
$bofiles =
CreateObject('property.bofiles');
if(isset($values['file_action']) &&
is_array($values['file_action']))
{
@@ -2426,9 +2426,8 @@
$bofiles->vfs->override_acl = 0;
}
}
- //
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
'property.uitts.index'));
-
+ //---------end files
if( phpgw::get_var('notify_client_by_sms',
'bool')
&& isset($values['response_text'])
&& $values['response_text']
@@ -2451,7 +2450,6 @@
$values =
$this->bocommon->preserve_attribute_values($values,$values_attribute);
}
- //---------end files
$ticket = $this->bo->read_single($id, $values);
if (isset($ticket['attributes']) &&
is_array($ticket['attributes']))
Modified:
branches/Version-1_0-branch/property/js/portico/condition_survey_edit.js
===================================================================
--- branches/Version-1_0-branch/property/js/portico/condition_survey_edit.js
2012-12-04 10:06:40 UTC (rev 10568)
+++ branches/Version-1_0-branch/property/js/portico/condition_survey_edit.js
2012-12-04 10:09:44 UTC (rev 10569)
@@ -25,6 +25,7 @@
var form = new Y.Validator(
{
form:'form',
+ checkOnSubmit:true,
defaultIncorrectIndicatorCss:'validator',
defaultCorrectIndicatorCss:'indicator',
createCorrectIndicator:true,
Modified: branches/Version-1_0-branch/property/js/yahoo/budget.obligations.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/budget.obligations.js
2012-12-04 10:06:40 UTC (rev 10568)
+++ branches/Version-1_0-branch/property/js/yahoo/budget.obligations.js
2012-12-04 10:09:44 UTC (rev 10569)
@@ -89,11 +89,17 @@
{
var details;
if(oRecord._oData.grouping != "")
+ {
details = 1;
+ text = oRecord._oData.grouping;
+ }
else
+ {
details = 0;
+ text = oRecord._oData.b_account;
+ }
- elCell.innerHTML = "<a
onclick=\"javascript:filter_grouping("+path_values.year+","+oRecord._oData.district_id+","+
oData +","+details+");\" href=\"#\">" + oData + "</a>";
+ elCell.innerHTML = "<a
onclick=\"javascript:filter_grouping("+path_values.year+","+oRecord._oData.district_id+","+
text +","+details+");\" href=\"#\">" + text + "</a>";
}
/********************************************************************************/
var myFormatLink_Count = function(elCell, oRecord, oColumn,
oData)
Modified: branches/Version-1_0-branch/property/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/setup.inc.php 2012-12-04
10:06:40 UTC (rev 10568)
+++ branches/Version-1_0-branch/property/setup/setup.inc.php 2012-12-04
10:09:44 UTC (rev 10569)
@@ -12,7 +12,7 @@
*/
$setup_info['property']['name'] = 'property';
- $setup_info['property']['version'] = '0.9.17.654';
+ $setup_info['property']['version'] = '0.9.17.655';
$setup_info['property']['app_order'] = 8;
$setup_info['property']['enable'] = 1;
$setup_info['property']['app_group'] = 'office';
Modified:
branches/Version-1_0-branch/property/templates/base/attributes_form.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/attributes_form.xsl
2012-12-04 10:06:40 UTC (rev 10568)
+++ branches/Version-1_0-branch/property/templates/base/attributes_form.xsl
2012-12-04 10:09:44 UTC (rev 10569)
@@ -36,6 +36,7 @@
<xsl:choose>
<xsl:when test="not(hide_row)">
<td align="left" width="19%"
valign="top" title="{$statustext}">
+ <label>
<xsl:choose>
<xsl:when
test="helpmsg=1">
<xsl:variable
name="help_url">
@@ -66,6 +67,7 @@
<xsl:text>
]</xsl:text>
</xsl:when>
</xsl:choose>
+ </label>
</td>
</xsl:when>
</xsl:choose>
Modified:
branches/Version-1_0-branch/property/templates/base/attributes_view.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/attributes_view.xsl
2012-12-04 10:06:40 UTC (rev 10568)
+++ branches/Version-1_0-branch/property/templates/base/attributes_view.xsl
2012-12-04 10:09:44 UTC (rev 10569)
@@ -18,6 +18,7 @@
</xsl:choose>
</xsl:attribute>
<td align="left" valign="top">
+ <label>
<xsl:value-of select="input_text"/>
<xsl:choose>
<xsl:when test="datatype='D'">
@@ -26,6 +27,7 @@
<xsl:text>]</xsl:text>
</xsl:when>
</xsl:choose>
+ </label>
</td>
<td align="left">
<xsl:choose>
Modified:
branches/Version-1_0-branch/property/templates/base/condition_survey.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/condition_survey.xsl
2012-12-04 10:06:40 UTC (rev 10568)
+++ branches/Version-1_0-branch/property/templates/base/condition_survey.xsl
2012-12-04 10:09:44 UTC (rev 10569)
@@ -2,38 +2,10 @@
<!-- add / edit -->
<xsl:template match="data" xmlns:formvalidator="http://www.w3.org/TR/html4/";
xmlns:php="http://php.net/xsl";>
- <xsl:choose>
- <xsl:when test="mode = 'edit'">
- <script type="text/javascript">
- self.name="first_Window";
- <xsl:value-of
select="lookup_functions"/>
- </script>
- </xsl:when>
- </xsl:choose>
- <script type="text/javascript">
- var property_js = <xsl:value-of select="property_js"/>;
- var base_java_url = <xsl:value-of
select="base_java_url"/>;
- var datatable = new Array();
- var myColumnDefs = new Array();
+ <xsl:call-template name="yui_phpgw_i18n"/>
- <xsl:for-each select="datatable">
- datatable[<xsl:value-of select="name"/>] = [
- {
- values:<xsl:value-of
select="values"/>,
- total_records: <xsl:value-of
select="total_records"/>,
- edit_action: <xsl:value-of
select="edit_action"/>,
- is_paginator: <xsl:value-of
select="is_paginator"/>,
- footer:<xsl:value-of
select="footer"/>
- }
- ]
- </xsl:for-each>
-
- <xsl:for-each select="myColumnDefs">
- myColumnDefs[<xsl:value-of select="name"/>] =
<xsl:value-of select="values"/>
- </xsl:for-each>
- </script>
<div class="yui-navset" id="survey_edit_tabview">
-
+
<h1>
<xsl:value-of select="php:function('lang', 'condition
survey')" />
</h1>
@@ -44,52 +16,49 @@
</xsl:variable>
<form name="form" id="form" action="{$action_url}"
method="post" ENCTYPE="multipart/form-data">
- <table cellpadding="2" cellspacing="2"
width="80%" align="center">
+ <dl>
<xsl:choose>
<xsl:when test="msgbox_data !=
''">
- <tr>
- <td
align="left" colspan="3">
+ <dt>
<xsl:call-template name="msgbox"/>
- </td>
- </tr>
+ </dt>
</xsl:when>
</xsl:choose>
- </table>
+ </dl>
<xsl:value-of disable-output-escaping="yes"
select="tabs"/>
<div class="yui-content">
- <div id="generic">
- <table>
+ <div id="generic" class="content-wrp">
+
+ <dl class="proplist-col">
<xsl:choose>
<xsl:when test="survey/id!=''">
- <tr>
- <td
valign="top">
-
<xsl:value-of select="php:function('lang', 'id')" />
- </td>
- <td>
+ <dt>
+
<label><xsl:value-of select="php:function('lang', 'id')" /></label>
+ </dt>
+ <dd>
<xsl:value-of select="survey/id"/>
<input
type="hidden" name="id" value="{survey/id}"/>
- </td>
- </tr>
+ </dd>
</xsl:when>
</xsl:choose>
<xsl:choose>
- <xsl:when
test="location_data!=''">
+ <xsl:when
test="location_data2!=''">
<xsl:choose>
<xsl:when test="editable = 1">
-
<xsl:call-template name="location_form"/>
+
<xsl:call-template name="location_form2"/>
</xsl:when>
<xsl:otherwise>
-
<xsl:call-template name="location_view"/>
+
<xsl:call-template name="location_view2"/>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
</xsl:choose>
- <tr>
- <td>
+
+ <dt>
<label for="name"><xsl:value-of
select="php:function('lang', 'name')" /></label>
- </td>
- <td>
+ </dt>
+ <dd>
<xsl:choose>
<xsl:when
test="editable = 1">
<input
id="title" name='values[title]' type="text" value="{survey/title}"
@@ -101,13 +70,13 @@
<xsl:value-of
select="survey/title" />
</xsl:otherwise>
</xsl:choose>
- </td>
- </tr>
- <tr>
- <td>
+ </dd>
+
+
+ <dt>
<label for="name"><xsl:value-of
select="php:function('lang', 'description')" /></label>
- </td>
- <td>
+ </dt>
+ <dd>
<xsl:choose>
<xsl:when
test="editable = 1">
<textarea
id="descr" name="values[descr]" rows="5" cols="60"
@@ -120,13 +89,13 @@
<xsl:value-of
select="survey/descr" disable-output-escaping="yes"/>
</xsl:otherwise>
</xsl:choose>
- </td>
- </tr>
- <tr>
- <td>
+ </dd>
+
+
+ <dt>
<label
for="category"><xsl:value-of select="php:function('lang', 'category')"
/></label>
- </td>
- <td>
+ </dt>
+ <dd>
<xsl:choose>
<xsl:when
test="editable = 1">
<select
id="cat_id" name="values[cat_id]"
@@ -136,18 +105,18 @@
</select>
</xsl:when>
<xsl:otherwise>
- <select
id="cat_id" disabled="disabled">
-
<xsl:apply-templates select="categories/options"/>
- </select>
- </xsl:otherwise>
+ <xsl:for-each
select="categories/options">
+ <xsl:if
test="selected = 'selected' or selected = 1">
+
<xsl:value-of disable-output-escaping="yes" select="name"/>
+
</xsl:if>
+ </xsl:for-each>
+ </xsl:otherwise>
</xsl:choose>
- </td>
- </tr>
- <tr>
- <td>
+ </dd>
+ <dt>
<label
for="category"><xsl:value-of select="php:function('lang', 'date')" /></label>
- </td>
- <td>
+ </dt>
+ <dd>
<xsl:choose>
<xsl:when
test="editable = 1">
<input
id="report_date" name='values[report_date]' type="text"
value="{survey/report_date}"
@@ -158,13 +127,12 @@
<xsl:value-of
select="survey/report_date"/>
</xsl:otherwise>
</xsl:choose>
- </td>
- </tr>
- <tr>
- <td>
+ </dd>
+
+ <dt>
<label
for="status"><xsl:value-of select="php:function('lang', 'status')" /></label>
- </td>
- <td>
+ </dt>
+ <dd>
<xsl:choose>
<xsl:when
test="editable = 1">
<select
id="status_id" name="values[status_id]"
@@ -174,19 +142,19 @@
</select>
</xsl:when>
<xsl:otherwise>
- <select
id="status_id" disabled="disabled">
-
<xsl:apply-templates select="status_list/options"/>
- </select>
+ <xsl:for-each
select="status_list/options">
+ <xsl:if
test="selected = 'selected' or selected = 1">
+
<xsl:value-of disable-output-escaping="yes" select="name"/>
+
</xsl:if>
+ </xsl:for-each>
</xsl:otherwise>
</xsl:choose>
- </td>
- </tr>
- <tr>
- <td>
+ </dd>
+ <dt>
<label
for="coordinator"><xsl:value-of select="php:function('lang', 'coordinator')"
/></label>
- </td>
- <td>
+ </dt>
+ <dd>
<xsl:choose>
<xsl:when
test="editable = 1">
@@ -202,14 +170,14 @@
</xsl:otherwise>
</xsl:choose>
- </td>
- </tr>
+ </dd>
- <tr>
- <td>
+
+
+ <dt>
<label
for="vendor"><xsl:value-of select="php:function('lang', 'vendor')" /></label>
- </td>
- <td>
+ </dt>
+ <dd>
<xsl:choose>
<xsl:when
test="editable = 1">
@@ -225,92 +193,64 @@
</xsl:otherwise>
</xsl:choose>
- </td>
- </tr>
+ </dd>
- </table>
- </div>
+ </dl>
+ </div>
+
<div id="documents">
<script type="text/javascript">
- var fileuploader_action = <xsl:value-of
select="fileuploader_action"/>;
+ var fileuploader_action = {
+
menuaction:'property.fileuploader.add',
+
upload_target:'property.bocondition_survey.addfiles',
+ id: '<xsl:value-of
select='survey/id'/>'
+ };
</script>
- <table cellpadding="2" cellspacing="2"
width="80%" align="center">
- <!-- <xsl:call-template
name="file_list"/> -->
- <tr>
- <td align="left" valign="top">
- <xsl:value-of
select="php:function('lang', 'files')"/>
- </td>
- <td>
- <div
id="datatable-container_0"/>
- </td>
- </tr>
- <xsl:call-template name="file_upload"/>
- </table>
- </div>
- <div id="import">
- </div>
+ <xsl:call-template name="datasource-definition"
/>
+ <dl class="proplist-col">
- <xsl:choose>
- <xsl:when test="documents !=
''">
- <div id="document">
- <!-- Some style
for the expand/contract section-->
- <style>
-
#expandcontractdiv {border:1px dotted #dedede; margin:0 0 .5em 0;
padding:0.4em;}
-
#treeDiv1 { background: #fff; padding:1em; margin-top:1em; }
- </style>
- <script
type="text/javascript">
- var
documents = <xsl:value-of select="documents"/>;
- </script>
- <!-- markup for
expand/contract links -->
- <div
id="expandcontractdiv">
- <a
id="expand" href="#">
-
<xsl:value-of select="php:function('lang', 'expand all')"/>
- </a>
-
<xsl:text> </xsl:text>
- <a
id="collapse" href="#">
-
<xsl:value-of select="php:function('lang', 'collapse all')"/>
- </a>
- </div>
- <div
id="treeDiv1"/>
- </div>
- </xsl:when>
- </xsl:choose>
+ <dt>
+ <label><xsl:value-of
select="php:function('lang', 'files')"/></label>
+ </dt>
+ <dd>
+ <div
style="clear:both;" id="datatable-container_0"></div>
+ </dd>
<xsl:choose>
- <xsl:when test="value_id !=''">
- <div id="related">
- <table
cellpadding="2" cellspacing="2" width="80%" align="center">
- <tr>
-
<td valign='top'>
-
<xsl:value-of select="php:function('lang', 'started from')"/>
-
</td>
-
<td>
-
<div id="datatable-container_1"/>
-
</td>
- </tr>
- <tr>
-
<td valign='top'>
-
<xsl:value-of select="php:function('lang', 'used in')"/>
-
</td>
-
<td>
-
<div id="datatable-container_2"/>
-
</td>
- </tr>
- </table>
- </div>
+ <xsl:when test="editable = 1">
+ <xsl:call-template
name="file_upload"/>
</xsl:when>
</xsl:choose>
+ </dl>
+ </div>
+ <xsl:choose>
+ <xsl:when test="editable = 1">
+ <div id="import">
+ <dl class="proplist-col">
+ <dt>
+
<label><xsl:value-of select="php:function('lang', 'upload file')"/></label>
+ </dt>
+ <dd>
+ <input
type="file" name="import_file" size="40">
+
<xsl:attribute name="title">
+
<xsl:value-of select="php:function('lang', 'Select file to upload')"/>
+
</xsl:attribute>
+ </input>
+ </dd>
+
+ </dl>
+ </div>
+ </xsl:when>
+ </xsl:choose>
</div>
- <table>
- <tr>
- <td>
- </td>
- <td>
+ <dl class="proplist-col">
+
+
<div class="form-buttons">
<xsl:variable
name="lang_cancel"><xsl:value-of select="php:function('lang', 'cancel')"
/></xsl:variable>
<xsl:choose>
@@ -328,20 +268,11 @@
</xsl:otherwise>
</xsl:choose>
</div>
- </td>
- </tr>
- </table>
-
+ </dl>
</form>
</div>
- <div id="lightbox-placeholder"
style="background-color:#000000;color:#FFFFFF;display:none">
- <div class="hd"
style="background-color:#000000;color:#000000; border:0; text-align:center">
- <xsl:value-of select="php:function('lang',
'fileuploader')"/>
- </div>
- <div class="bd" style="text-align:center;"> </div>
- </div>
<xsl:variable name="cancel_url">
<xsl:value-of select="php:function('get_phpgw_link',
'/index.php', 'menuaction:property.uicondition_survey.index')" />
@@ -368,7 +299,20 @@
</xsl:template>
+<xsl:template name="datasource-definition">
+ <script>
+ YAHOO.util.Event.onDOMReady(function(){
+ <xsl:for-each select="datatable_def">
+ YAHOO.portico.inlineTableHelper("<xsl:value-of
select="container"/>", <xsl:value-of select="requestUrl"/>, <xsl:value-of
select="ColumnDefs"/>);
+ </xsl:for-each>
+
+ });
+ </script>
+
+</xsl:template>
+
+
<xsl:template match="options">
<option value="{id}">
<xsl:if test="selected = 'selected' or selected = 1">
@@ -378,3 +322,29 @@
<xsl:value-of disable-output-escaping="yes" select="name"/>
</option>
</xsl:template>
+
+ <xsl:template xmlns:php="http://php.net/xsl"; name="file_upload">
+ <dt>
+ <label><xsl:value-of select="php:function('lang',
'upload file')"/></label>
+ </dt>
+ <dd>
+ <input type="file" name="file" size="40">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="php:function('lang', 'Select file to upload')"/>
+ </xsl:attribute>
+ </input>
+ </dd>
+ <xsl:choose>
+ <xsl:when test="multiple_uploader!=''">
+ <dt>
+ <label><a
href="javascript:fileuploader()">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="php:function('lang', 'upload multiple files')"/>
+ </xsl:attribute>
+ <xsl:value-of
select="php:function('lang', 'upload multiple files')"/>
+ </a></label>
+ </dt>
+ </xsl:when>
+ </xsl:choose>
+ </xsl:template>
+
Copied:
branches/Version-1_0-branch/property/templates/base/condition_survey_import.xsl
(from rev 10568, trunk/property/templates/base/condition_survey_import.xsl)
===================================================================
---
branches/Version-1_0-branch/property/templates/base/condition_survey_import.xsl
(rev 0)
+++
branches/Version-1_0-branch/property/templates/base/condition_survey_import.xsl
2012-12-04 10:09:44 UTC (rev 10569)
@@ -0,0 +1,214 @@
+<!-- $Id: condition_survey.xsl 10560 2012-11-30 13:52:18Z sigurdne $ -->
+
+ <!-- import -->
+<xsl:template match="data" xmlns:formvalidator="http://www.w3.org/TR/html4/";
xmlns:php="http://php.net/xsl";>
+ <xsl:call-template name="yui_phpgw_i18n"/>
+
+ <div class="yui-navset yui-navset-top" id="survey_edit_tabview">
+
+ <h1>
+ <xsl:value-of select="php:function('lang', 'condition
survey import')" />
+ </h1>
+
+
+ <xsl:variable name="action_url">
+ <xsl:value-of select="php:function('get_phpgw_link',
'/index.php', 'menuaction:property.uicondition_survey.import')" />
+ </xsl:variable>
+
+ <form name="form" id="form" action="{$action_url}"
method="post" ENCTYPE="multipart/form-data">
+ <dl>
+ <dt>
+ <label><xsl:value-of
select="php:function('lang', 'id')" /></label>
+ </dt>
+ <dd>
+ <xsl:value-of
select="survey/id"/>
+ <input type="hidden" name="id"
value="{survey/id}"/>
+ <input type="hidden"
name="step" value="{step}"/>
+ <input type="hidden"
name="selected_sheet_id" value="{sheet_id}"/>
+ </dd>
+
+ <xsl:choose>
+ <xsl:when
test="location_data2!=''">
+ <xsl:call-template
name="location_view2"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <dt>
+ <label for="name"><xsl:value-of
select="php:function('lang', 'name')" /></label>
+ </dt>
+ <dd>
+ <xsl:value-of
select="survey/title" />
+ </dd>
+
+ </dl>
+ <xsl:value-of disable-output-escaping="yes"
select="tabs"/>
+ <div class="yui-content">
+ <xsl:choose>
+ <xsl:when test="step=1">
+ <xsl:call-template
name="import_step_1"/>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="step=2">
+ <xsl:call-template
name="import_step_2"/>
+ </xsl:when>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="step=3">
+ <xsl:call-template
name="import_step_3"/>
+ </xsl:when>
+ </xsl:choose>
+
+ </div>
+
+ <dl class="proplist-col">
+ <div class="form-buttons">
+ <xsl:variable
name="lang_cancel"><xsl:value-of select="php:function('lang', 'cancel')"
/></xsl:variable>
+ <xsl:variable
name="lang_save"><xsl:value-of select="php:function('lang', 'save')"
/></xsl:variable>
+ <input type="submit"
name="save_project" value="{$lang_save}" title = "{$lang_save}" />
+ <input class="button"
type="button" name="cancelButton" id ='cancelButton' value="{$lang_cancel}"
title = "{$lang_cancel}" onClick="document.cancel_form.submit();"/>
+ </div>
+ </dl>
+ </form>
+ </div>
+
+ <xsl:variable name="cancel_url">
+ <xsl:value-of select="php:function('get_phpgw_link',
'/index.php', 'menuaction:property.uicondition_survey.index')" />
+ </xsl:variable>
+
+ <form name="cancel_form" id="cancel_form"
action="{$cancel_url}" method="post">
+ </form>
+ <xsl:variable name="new_url">
+ <xsl:value-of select="php:function('get_phpgw_link',
'/index.php', 'menuaction:property.uicondition_survey.add')" />
+ </xsl:variable>
+ <form name="new_form" id="new_form" action="{$new_url}"
method="post">
+ </form>
+
+ <xsl:variable name="edit_params">
+
<xsl:text>menuaction:property.uicondition_survey.import, id:</xsl:text>
+ <xsl:value-of select="survey/id" />
+ </xsl:variable>
+ <xsl:variable name="edit_url">
+ <xsl:value-of
select="php:function('get_phpgw_link', '/index.php', $edit_params )" />
+ </xsl:variable>
+
+ <form name="load_edit_form" id="load_edit_form"
action="{$edit_url}" method="post">
+ </form>
+
+ </xsl:template>
+
+<xsl:template name="datasource-definition">
+ <script>
+ YAHOO.util.Event.onDOMReady(function(){
+
+ <xsl:for-each select="datatable_def">
+ YAHOO.portico.inlineTableHelper("<xsl:value-of
select="container"/>", <xsl:value-of select="requestUrl"/>, <xsl:value-of
select="ColumnDefs"/>);
+ </xsl:for-each>
+
+ });
+ </script>
+
+</xsl:template>
+
+
+<xsl:template name="import_step_1"
xmlns:formvalidator="http://www.w3.org/TR/html4/";
xmlns:php="http://php.net/xsl";>
+ <dl class="proplist-col">
+ <dt>
+ <label for="status"><xsl:value-of
select="php:function('lang', 'sheets')" /></label>
+ </dt>
+ <dd>
+ <select id="sheet_id" name="sheet_id">
+ <xsl:apply-templates select="sheets/options"/>
+ </select>
+ </dd>
+ </dl>
+
+</xsl:template>
+
+<xsl:template name="import_step_2" xmlns:php="http://php.net/xsl";>
+ <dl class="proplist-col">
+
+ <dt>
+ <label for="status"><xsl:value-of
select="php:function('lang', 'sheets')" /></label>
+ </dt>
+ <dd>
+ <xsl:for-each select="sheets/options">
+ <xsl:if test="selected = 'selected' or selected
= 1">
+ <xsl:value-of
disable-output-escaping="yes" select="name"/>
+ </xsl:if>
+ </xsl:for-each>
+ </dd>
+
+ <dt>
+ <label for="status"><xsl:value-of
select="php:function('lang', 'table')" /></label>
+ </dt>
+ <dd>
+ <xsl:value-of disable-output-escaping="yes"
select="html_table"/>
+ </dd>
+ </dl>
+</xsl:template>
+
+<xsl:template name="import_step_3" xmlns:php="http://php.net/xsl";>
+ <dl class="proplist-col">
+ <dt>
+ <label><xsl:value-of select="php:function('lang',
'sheets')" /></label>
+ </dt>
+ <dd>
+ <xsl:for-each select="sheets/options">
+ <xsl:if test="selected = 'selected' or selected
= 1">
+ <xsl:value-of
disable-output-escaping="yes" select="name"/>
+ </xsl:if>
+ </xsl:for-each>
+ </dd>
+ <dt>
+ <label><xsl:value-of select="php:function('lang',
'line')" /></label>
+ </dt>
+ <dd>
+ <xsl:value-of select="start_line"/>
+ </dd>
+ <dt>
+ <label><xsl:value-of select="php:function('lang',
'columns')" /></label>
+ </dt>
+ <dd>
+ <xsl:value-of disable-output-escaping="yes"
select="html_table"/>
+ </dd>
+ </dl>
+</xsl:template>
+
+
+<xsl:template match="options">
+ <option value="{id}">
+ <xsl:if test="selected = 'selected' or selected = 1">
+ <xsl:attribute name="selected" value="selected" />
+ </xsl:if>
+ <xsl:attribute name="title" value="description" />
+ <xsl:value-of disable-output-escaping="yes" select="name"/>
+ </option>
+</xsl:template>
+
+ <xsl:template xmlns:php="http://php.net/xsl"; name="file_upload">
+ <dt>
+ <label><xsl:value-of select="php:function('lang',
'upload file')"/></label>
+ </dt>
+ <dd>
+ <input type="file" name="file" size="40">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="php:function('lang', 'Select file to upload')"/>
+ </xsl:attribute>
+ </input>
+ </dd>
+ <xsl:choose>
+ <xsl:when test="multiple_uploader!=''">
+ <dt>
+ <label><a
href="javascript:fileuploader()">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="php:function('lang', 'upload multiple files')"/>
+ </xsl:attribute>
+ <xsl:value-of
select="php:function('lang', 'upload multiple files')"/>
+ </a></label>
+ </dt>
+ </xsl:when>
+ </xsl:choose>
+ </xsl:template>
+
Modified: branches/Version-1_0-branch/property/templates/base/contact_form.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/contact_form.xsl
2012-12-04 10:06:40 UTC (rev 10568)
+++ branches/Version-1_0-branch/property/templates/base/contact_form.xsl
2012-12-04 10:09:44 UTC (rev 10569)
@@ -14,9 +14,11 @@
</script>
<tr>
<td valign="top">
- <a href="javascript:{field}_contact_lookup()"
title="{lang_select_contact_help}">
- <xsl:value-of select="lang_contact"/>
- </a>
+ <label>
+ <a
href="javascript:{field}_contact_lookup()" title="{lang_select_contact_help}">
+ <xsl:value-of
select="lang_contact"/>
+ </a>
+ </label>
</td>
<td>
<table>
Modified: branches/Version-1_0-branch/property/templates/base/css/base.css
===================================================================
--- branches/Version-1_0-branch/property/templates/base/css/base.css
2012-12-04 10:06:40 UTC (rev 10568)
+++ branches/Version-1_0-branch/property/templates/base/css/base.css
2012-12-04 10:09:44 UTC (rev 10569)
@@ -21,26 +21,7 @@
border: 0px;
}
-label, input[type=text], input[type=password], input[type=checkbox],
input[type=radio], select, textarea
-{
- margin-bottom: 8px;
-}
-label, input[type=text], input[type=password], select, textarea
-{
- display: block;
- float: left;
- margin-bottom: 8px;
-}
-
-label
-{
- text-align: right;
- width: 150px;
- padding-right: 10px;
- font-weight: bold;
-}
-
textarea
{
/* white-space: normal;*/
@@ -134,4 +115,1217 @@
z-index: 2;
}
+/*
+from logistic
+*/
+#list_navigation { float: left; width: 30%; }
+#user_messages { float: right; width: 40%;}
+
+div.content {
+ margin: 2em;
+}
+.hd {
+ margin-bottom: 0;
+ text-align: center;
+}
+.hd img {
+ vertical-align: middle;
+}
+fieldset {
+ margin-top: 0.5em;
+}
+
+legend {
+ font-weight: bolder;
+ margin-bottom: 0.2em;
+}
+
+label {
+ font-size: 13px;
+ font-weight: bold;
+ margin-right: 5px;
+ display: inline-block;
+}
+
+a{
+ cursor: pointer;
+}
+
+.row{
+ padding: 0.3em 0;
+}
+h3 {
+ font-size: 1.2em;
+ font-weight: bold;
+ margin: 1em 0;
+}
+#content {
+ margin: 2em 1em;
+}
+.clr { clear: both;}
+
+#active {
+ background-color: #ffffff;
+ width: 10em;
+ padding: 1em;
+ border: 0em dotted #000000;
+ letter-spacing: 2px;
+}
+
+#inactivate-button {
+ border: 1px solid #000000;
+ margin-top: 1em;
+ padding: 0.1em;
+ background-color: #ffffff;
+}
+
+#activate-button {
+ border: 1px solid #000000;
+ margin-top: 1em;
+ padding: 0.1em;
+ background-color: #ffffff;
+}
+
+.breadcrumbs{
+ margin-left: 20px;
+}
+
+ul.pathway {
+ font-weight: bolder;
+ margin: 1em 0;
+ font-size: 110%;
+}
+ul.pathway li a { color: #000; text-decoration: none;}
+ul.pathway li a:hover { color: #008; }
+ul.pathway li {
+ display: inline;
+ background: url(../images/pathwaysep.png) no-repeat 0% 50%;
+ padding-left: 16px;
+}
+ul.pathway li:first-child { background: none; padding-left: 0;}
+
+dl.form, dl.form-col {
+ margin: 1em 1em 1em 0;
+}
+
+dl.form dt, dl.form-col dt {
+ font-style: italic;
+ font-weight: bolder;
+ margin: .5em 0 .1em 0;
+ color: #002;
+}
+dl.form dd textarea,
+dl.form-col dd textarea {
+ width: 15em;
+ height: 6em;
+}
+dl.form dd textarea.full-width,
+dl.form-col dd textarea.full-width {
+ width: 33em;
+ height: 10em;
+}
+
+dl.form dd input[type="text"], dl.form dd .autocomplete,
+dl.form-col dd input[type="text"], dl.form-col dd .autocomplete {
+ width: 15em;
+}
+dl.form dd .autocomplete,
+dl.form-col dd .autocomplete,
+dl.form-2col dd .autocomplete {
+ padding-bottom: 2em;
+}
+
+div.autocomplete {
+ width: 15em;
+ position: relative;
+ padding-bottom: 2em;
+}
+/* ie fix. autocomplete dropdown is displayed behind some elements if the
z-index is not set */
+div.autocomplete input {
+ z-index: 500;
+}
+
+
+dl.form dt.heading, dl.form-col dt.heading {
+ color: #448;
+ font-weight: normal;
+ font-size: 110%;
+ margin-top: 1.4em;
+ margin-bottom: .6em;
+ border-bottom: 1px solid #aaa;
+}
+
+dl.proplist,
+dl.proplist-col {
+ margin: 1em 0;
+ padding-left: 2em;
+}
+
+dl.proplist-col,
+dl.form-col {
+ /* width: 18em; */
+ float: left;
+}
+
+div.identifier-header {
+ padding-left: 2em;
+ margin-bottom: 1em;
+}
+
+div.identifier-header label {
+ font-weight: bold;
+}
+
+.form-buttons {
+ clear: both;
+ padding-top: 1em;
+}
+
+.form-buttons input[type=submit], input[type="button"]{
+ margin-right: 5px;
+}
+
+.form-buttons button {
+ margin-right: .5em;
+}
+
+.form-buttons .cancel {
+ margin-left: .6em;
+}
+
+.date-picker .container,
+.datetime-picker .container {
+ display:none;
+ position:absolute; z-index:1;
+}
+
+#datatableToolbar {
+ background-color: white;
+ margin-bottom: 0em;
+ padding: .3em;
+}
+
+table.datatableToolbar {
+ padding: .3em;
+}
+
+#controller_user_error {
+ width: 100%;
+ background-color: #eee;
+ border: 0px none #bbb;
+ margin-bottom: 0em;
+ padding-left: .3em;
+ color: red;
+ font-size: larger;
+}
+
+#controller_user_message {
+ width: 100%;
+ background-color: #eee;
+ border: 0px none #bbb;
+ margin-bottom: 0em;
+ padding-left: .3em;
+ color: green;
+ font-size: larger;
+}
+
+.toolbarelement {
+ vertical-align:middle;
+}
+td.toolbarlabel {
+ width: 10em;
+ font-weight: bold;
+}
+td.toolbarcol {
+ padding-left: 1em;
+}
+
+div.calendarButtons {
+ vertical-align:middle;
+ background-color: grey;
+}
+
+label.toolbar_element_label {
+ padding-left: .25em;
+ padding-right: .50em;
+ vertical-align: middle;
+}
+#toolbar input[type="text"] {
+ font-size: 120%;
+ margin: auto .25em;
+}
+
+dl.proplist dd.address,
+dl.proplist-col dd.address {
+ white-space: pre;
+}
+
+.date-container {
+ margin-bottom: .8em;
+ white-space: nowrap;
+}
+
+.date-container .close-btn {
+ display: block;
+ float: right;
+ border: none;
+ text-decoration: none;
+ background:transparent
url(../../../../phpgwapi/js/yahoo/assets/skins/sam/sprite.png) no-repeat scroll
0 -300px;
+ width: 25px;
+ height: 15px;
+ cursor: pointer;
+ color: white;
+}
+
+div.allocation-list
+{
+ width: 30em;
+ height: 10em;
+ border: 1px solid #555;
+ padding: .4em;
+ overflow: auto;
+}
+
+.showit {
+ visibility: visible;
+}
+.hideit {
+ visibility: hidden;
+}
+.datatable{
+ margin-left: 20px;
+ margin-top: 10px;
+}
+
+/* Styles for this the column selector */
+#dt-columnselector {width:45em;margin:0 auto;}
+#dt-options {margin-left:5px;}
+#dt-dlg {visibility:hidden;border:1px solid #808080;background-color:#E3E3E3;}
+#dt-dlg .hd
{font-weight:bold;padding:1em;background:none;background-color:#E3E3E3;border-bottom:0;}
+#dt-dlg .ft {text-align:right;padding:.5em;background-color:#E3E3E3;}
+#dt-dlg .bd {height:15em;margin:0 1em;overflow:auto;border:1px solid
black;background-color:white;}
+#dt-dlg .dt-dlg-pickercol {clear:both;padding:.5em 1em 3em;border-bottom:1px
solid gray;}
+#dt-dlg .dt-dlg-pickerkey {float:left;}
+#dt-dlg .dt-dlg-pickerbtns {float:right;}
+/* Container workarounds for Mac Gecko scrollbar issues */
+.yui-panel-container.hide-scrollbars #dt-dlg .bd {
+ /* Hide scrollbars by default for Gecko on OS X */
+ overflow: hidden;
+}
+.yui-panel-container.show-scrollbars #dt-dlg .bd {
+ /* Show scrollbars for Gecko on OS X when the Panel is visible */
+ overflow: auto;
+}
+#dt-dlg_c .underlay {overflow:hidden;}
+.inprogress {position:absolute;} /* transitional progressive enhancement state
*/
+}
+
+dl.controller-description {
+ width: 70%;
+}
+
+dl.controller-description dt, dl.controller-description-edit {
+ width: 100%;
+ float:left;
+ font-weight:bold;
+}
+
+dl.controller-description dd {
+ width: 100%;
+ border: 1px solid #ccc;
+ float: left;
+ background-color: white;
+ height: 100px;
+ overflow-y: scroll;
+}
+
+dl.controller-description-edit textarea {
+ width: 100%;
+ height: 100px;
+ border: 1px solid #ccc;
+ float: left;
+}
+
+input#place {
+ width:60%;
+}
+
+input#address_1 {
+ width: 60%;
+ float:left;
+}
+
+input#house_number {
+ width: 20%;
+ float: left;
+}
+
+input.postcode {
+ width: 50px;
+ float: left;
+}
+
+.yui-navset {
+ clear: both;
+ margin-left: 2em;
+ margin-right: 2em;
+}
+
+h1 img, li img {
+ vertical-align: middle;
+}
+/* Set up common form styles. TODO: needs refinement. */
+
+/*
======================================================================================================================
+ CONTROLLER MODULE CSS
+
========================================================================================================================
*/
+
+/* ========================================== SELECTORS, IDS AND CLASSES
=========================================== */
+
+input[type="radio"] {
+ margin: 0 5px 0 2px;
+ padding: 3px 6px;
+}
+
+input[type="checkbox"] {
+ margin: 5px;
+}
+
+input[type="text"] {
+ padding: 5px 5px 2px;
+}
+
+select {
+ padding: 4px;
+}
+
+fieldset {
+ border-bottom:0px solid #ccc;
+}
+
+textarea{
+ padding: 4px;
+}
+
+h1 em {
+ font-style:italic;
+}
+
+a {
+ color: #0066CC;
+ text-decoration: none;
+}
+
+#innertoolbar-button, input[type="submit"], input[type="button"]{
+ background: none repeat scroll 0 0 #4F9AEA;
+ border: 1px solid #4685C8;
+ border-radius: 4px 4px 4px 4px;
+ color: #FFFFFF;
+ cursor: pointer;
+ padding: 3px 15px;
+}
+
+input[type="submit"][disabled]
+{
+ background: none repeat scroll 0 0 #A3D1FF;
+}
+
+#innertoolbar-button {
+ font-size: 1em;
+ line-height: 1.2em;
+ min-height: 1.2em;
+ padding: 2px 15px;
+}
+
+a#innertoolbar-button {
+ padding: 3px 15px;
+}
+
+.row input[type="submit"] {
+ padding: 2px 10px;
+}
+
+
+.info, .error, .warning {
+ font-weight: normal;
+ margin:20px;
+ padding:5px;
+ font-size:1.1em;
+ text-align: left;
+}
+
+.message {
+ margin: 5px;
+}
+
+.info {
+ background-color:#CCFFCC;
+ border:1px solid #00FF00;
+ color:black;
+}
+
+.warning {
+ background-color: #FEEFB3;
+ border:1px solid #9F6000;
+ color:#9F6000;
+}
+.yui-calendar td.calcell {
+ border:0px !important;
+}
+
+.yui-skin-sam .yui-dt TABLE TH{
+ border: none !important;
+}
+
+.yui-skin-sam .yui-dt TABLE TD{
+ border: none !important;
+}
+
+/*
+.yui-skin-sam .yui-button .first-child {
+ border: 0 none;
+ margin: 0 10px 0 0;
+}
+
+.yui-skin-sam .yui-button {
+ background: none;
+ border:0;
+ margin: 0;
+}
+*/
+.datatable_container {
+ margin-left: 1em;
+ margin-top: 1em;
+}
+
+.paginator {
+ margin-left: 1em !important;
+}
+
+th.yui-dt-sortable div{
+ background: url(../../../../phpgwapi/js/yahoo/assets/skins/sam/sprite.png)
repeat-x scroll 0pt -100px rgb(216, 216, 218);
+}
+
+dd ol li {
+ list-style: decimal;
+ list-style-position: inside;
+}
+
+dd ul li {
+ list-style: disc;
+ list-style-position: inside;
+}
+
+h1 img{
+ margin-right:5px;
+}
+
+.yui-content h2{
+ margin:0 0 10px;
+}
+
+
+/* ======================================= EXPAND LIST
========================================= */
+
+ul.expand_list h4 {
+ cursor: pointer;
+ font-size: 1.1em;
+ margin-bottom: 6px;
+ margin-top: 0;
+}
+ul.expand_list h4 img {
+ height: 12px;
+}
+
+ul.expand_list li ul {
+ display:none;
+ margin-left:21px;
+}
+
+ul.expand_list li ul li {
+ margin-bottom: 3px;
+ padding: 3px;
+}
+
+ul.expand_list h4 span {
+ padding-left: 5px;
+ vertical-align: middle;
+}
+ul.expand_list .expand_item {
+ display: none;
+}
+
+dl.proplist, dl.proplist-col {
+ margin: 0;
+ padding-left: 0;
+ width: 50%;
+}
+
+#details .proplist dd, #details .proplist-col dd{
+ margin-bottom: 0.5em;
+}
+
+.frm_save_order input[type='submit']{
+ margin: 10px 0 15px 0;
+ width: 120px;
+}
+.delete {
+ cursor: pointer;
+ margin-left: 5px;
+}
+.yui-navset .yui-content.tab_content {
+ padding: 20px;
+}
+
+#datatable-container {
+ margin: 20px;
+}
+
+#paginator {
+ margin: 20px;
+}
+
+#paginator.top {
+ margin: 20px 0 0 20px;
+}
+
+#toolbar {
+ display: inline-block;
+ padding: 10px 0;
+}
+
+#toolbar input[type="text"] {
+ font-size: 100%;
+ padding: 3px;
+}
+
+#toolbar input[type="submit"] {
+ padding:0 8px;
+ margin-top:0;
+}
+
+.yui-button.yui-link-button.new_button{
+ margin-left:30px;
+}
+
+#view_check_lists {
+ padding: 30px;
+ width: 600px;
+}
+
+ul.th {
+ font-weight: bold;
+ overflow:hidden;
+}
+
+ul.th li {
+ float: left;
+ margin-right: 20px;
+ padding: 3px 6px;
+ width: 100px;
+}
+
+ul.row{
+ overflow: hidden;
+}
+
+ul.row li{
+ float:left;
+ margin-right: 20px;
+ padding: 3px 6px;
+ width: 100px;
+}
+
+/* ======================================= GENERAL CLASSES
========================================= */
+
+.box {
+ background: none repeat scroll 0 0 #EDF5FF;
+ border: 1px solid #eee;
+ margin-bottom: 20px;
+ padding: 15px;
+}
+.box.ext {
+ background: none repeat scroll 0 0 #FEFBF7;
+ border: 1px solid #FEEDEA;
+}
+
+.box_header {
+ background: none repeat scroll 0 0 #CFE6FF;
+ border-color: #C7DCF2;
+ border-style: solid;
+ border-width: 1px 1px 0;
+ color: #444444;
+ font-size: 13px;
+ font-weight: bold;
+ margin: 0;
+ padding: 6px 0 6px 15px;
+ text-align: left;
+}
+
+.box_header.ext {
+ background: none repeat scroll 0 0 #F57056;
+ border-color: #EB9685;
+ color: #FFFFFF;
+}
+
+.btn, .btn_m, .btn-sm {
+ background: none repeat scroll 0 0 #4F9AEA;
+ border: 1px solid #428AD7;
+ border-radius: 4px;
+ color: #FFFFFF;
+ cursor: pointer;
+ display: inline-block;
+ padding: 5px 10px;
+ text-decoration: none;
+}
+
+.btn_m{
+ padding: 2px 6px;
+ font-size: 12px;
+}
+
+.btn-sm {
+ font-size: 12px;
+ padding: 1px 4px;
+ text-align: center;
+}
+
+.btn.cancel, .btn_m.cancel, .btn-sm.cancel {
+ background: none repeat scroll 0 0 #EEEEEE;
+ border: 1px solid #CCCCCC;
+ color: #333333;
+}
+
+.btn.non-focus {
+ background: none repeat scroll 0 0 #A0C8F2;
+ border: 1px solid #74B0EF;
+ color: #0A3E74;
+}
+
+.btn.focus, .btn_m.focus {
+ background: none repeat scroll 0 0 #F57056;
+ border-color: #EE836F #CB563F #CB563F;
+ border-style: solid none;
+ border-width: 1px 0;
+ color: #FFFFFF;
+ margin-top: 1px;
+}
+
+/* ======================================= MAIN CONTENT
========================================= */
+
+#main_content {
+ padding: 20px;
+ width: 1150px;
+}
+
+#main_content.groups{
+ cursor: default;
+}
+
+#main_content h1{
+ margin-top:0;
+}
+
+.content-wrp {
+ background: none repeat scroll 0 0 #EDF5FF;
+ border: 1px solid #DEE1E4;
+ margin-top: 1em;
+ padding: 0;
+}
+
+.content-wrp .yui-skin-sam .yui-dt table {
+ border: 1px solid #CCCCCC;
+}
+
+/* ======================================= CHECK LIST DETAILS
========================================= */
+
+input.id {
+ background: none repeat scroll 0 0 #FFFFFF;
+ border: 1px solid #DDDDDD;
+ text-align: right;
+ width: 50px;
+}
+
+input.date {
+ text-align: right;
+ width: 80px;
+}
+
+input.datetime {
+ text-align: right;
+ width: 110px;
+}
+
+
+/* ======================================= TAB CHECK LIST DETAILS
========================================= */
+.tab_check_list_details label {
+ display: inline-block;
+ font-weight: bold;
+ width: 100px;
+}
+
+fieldset.tab_check_list_details {
+ padding: 0 0 10px 0;
+}
+
+
+
+.form-buttons-top{
+ float: right;
+ margin-bottom:5px;
+}
+
+.form-buttons-top input[type="submit"]{
+ margin:0;
+}
+
+#frm_save_check_items h1 {
+ float: left;
+ margin: 5px;
+}
+
+ul.check_list {
+ width: 925px;
+}
+
+/* ============================= SEARCH LOCATION BOX =======================
*/
+#search-location {
+ float: right;
+ margin-bottom: 10px;
+}
+
+#search-location-name {
+ margin: 2px 0 0;
+ width: 16em;
+}
+
+#choose-my-location {
+ float: right;
+ margin-right: 10px;
+}
+
+#choose-building {
+ float: left;
+}
+
+#filters {
+ clear: left;
+ float: left;
+}
+
+.select-box {
+ background: none repeat scroll 0 0 #FEFBF4;
+ border: 1px solid #DDDDDD;
+ border-radius: 4px;
+ padding: 1em;
+}
+
+.select-box label{
+ margin-bottom:5px;
+ display: block;
+}
+
+.select-box a{
+ display: block;
+ font-weight: bold;
+ padding: 0 0 10px;
+ text-align: justify;
+}
+
+.select-box a.last{
+ padding: 0;
+}
+
+#choose-loc .btn {
+ display: inline-block;
+ font-size: 0.9em;
+ padding: 2px 8px;
+}
+
+#choose-loc .btn.first {
+ margin-right: 0.3em;
+}
+
+#choose-loc .btn.active{
+ background: #3F7EC1;
+}
+#choose-loc label {
+ display: inline-block;
+}
+
+
+
+.yui-pg-first{
+ margin-left: 14px;
+ margin-top: 5px;
+}
+
+#data_paginator, #loc_paginator{
+ margin:8px;
+ clear:left;
+}
+
+ul#filters li, ul#search_list li{
+ float:left;
+}
+
+ul#filters input[type="text"], ul#filters select {
+ margin-right: 5px;
+ padding: 3px;
+}
+
+#choose_control select {
+ float: left;
+ margin-right: 5px;
+}
+
+#choose_control form {
+ float: left;
+}
+
+ul#search_list input[type="submit"] {
+ margin: 0;
+ padding: 2px 15px;
+}
+
+ul#search_list input[type="text"] {
+ margin: 0 5px 0 0;
+ padding: 3px;
+}
+
+#queryForm {
+ clear: both;
+ margin: 20px;
+ overflow: hidden;
+}
+
+fieldset.add_check_list div{
+ padding:2px;
+}
+fieldset.add_check_list label{
+ display:inline-table;
+ width:120px;
+}
+
+
+label.comment{
+ vertical-align:top;
+}
+/* ======================== TAB MENU ========================== */
+
+.tab_menu a {
+ background: none repeat scroll 0 0 #F9F5F0;
+ border: 1px solid #F0F0F0;
+ color: #444444;
+ display: inline-block;
+ font-weight: bold;
+ margin-right: 3px;
+ padding: 6px 0;
+ text-align: center;
+ text-decoration: none;
+ width: 150px;
+}
+.tab_menu a.active {
+ background: none repeat scroll 0 0 #CAE3FB;
+ border: 1px solid #CAE3FB;
+ font-weight: bold;
+}
+.tab_menu a, .tab_menu a.active{
+ border-bottom: 0;
+}
+
+#tab_content {
+ background: none repeat scroll 0 0 #EDF5FF;
+ border: 1px solid #DBE5EF;
+ padding: 0 20px 20px;
+}
+
+/* =================================== TAB ITEM
================================= */
+
+.tab_item {
+ background: none repeat scroll 0 0 #F7FAFF;
+ border: 1px solid #DAE2EE;
+ padding: 15px;
+}
+.tab_item.ext {
+ background: none repeat scroll 0 0 #FEFBF7;
+ border: 1px solid #FEEDEA;
+}
+.tab_item h2 {
+ background: none repeat scroll 0 0 #DAE3EB;
+ font-size: 14px;
+ margin: 0 0 10px;
+ padding: 3px 6px;
+}
+.tab_item h2.last{
+ margin:20px 0 10px;
+}
+
+#main_content fieldset.location_details{
+ background: none repeat scroll 0 0 #EDF5FF;
+ border: 1px solid #CCCCCC;
+ padding: 15px;
+ float:left;
+ border: 1px solid #ddd;
+}
+fieldset.location_details div{
+ margin:10px 0;
+}
+
+#curtain {
+ background: none repeat scroll 0 0 #000000;
+ display: none;
+ height: 100%;
+ left: 0;
+ opacity: 0.6;
+ position: fixed;
+ top: 0;
+ width: 100%;
+ z-index: 1;
+}
+
+#popupBox {
+ background: none repeat scroll 0 0 #FFFFFF;
+ display: none;
+ left: 50%;
+ position: absolute;
+ top: 30%;
+ width: 500px;
+ margin-left: -250px;
+ z-index: 2;
+}
+
+/* ================================== CHECK LIST
================================== */
+
+#main_content.medium {
+ overflow: hidden;
+ width: 900px;
+}
+
+/* ==================================== CASE DETAILS
============================== */
+#error_message_menu {
+ float: left;
+ margin-top: 50px;
+}
+#error_message_menu a {
+ text-align: center;
+ width: 140px;
+ margin: 2px 0;
+ display:block;
+}
+#register_errors_content {
+ float: right;
+ margin-top: 20px;
+}
+
+
+/* =============================== FORM REGISTER CASE
============================= */
+
+.frm_register_case {
+ margin-bottom: 1em;
+}
+.frm_register_case input[type="text"]{
+ width: 170px;
+}
+.frm_register_case select {
+ width: 184px;
+}
+.frm_register_case textarea {
+ display: block;
+ height: 100px;
+ margin-top: 6px;
+ margin-bottom: 1em;
+ width: 63%;
+}
+.frm_register_case label {
+ display: inline-block;
+ width: 18%;
+}
+
+
+#queryForm #choose-location {
+ margin: 0;
+}
+
+#choose-location h4{
+ display: block;
+ font-size: 17px;
+ margin: 5px 0;
+}
+
+#comp-filters label {
+ font-size: 1em;
+ font-weight: bold;
+}
+
+#comp-filters .select-box {
+ background: none repeat scroll 0 0 #DEEAF8;
+ border: 1px solid #BDD3ED;
+ float: left;
+ height: 40px;
+ margin-right: 5px;
+}
+
+#comp-filters .filter {
+ float: left;
+}
+
+#choose-location #datatable-container{
+ margin: 20px 0;
+}
+
+
+#data_paginator .error_msg{
+ margin-left:20px;
+}
+
+#locations-container{
+ margin:20px;
+}
+
+#select_all {
+ float: right;
+ margin-right: 805px;
+}
+
+#save_location {
+ margin-left:20px;
+ margin-bottom:20px;
+}
+
+
+/* ============================= IMAGE LOADER ======================= */
+
+img#loading {
+ margin-left: 5px;
+ vertical-align: middle;
+}
+
+#exec-print {
+ margin:20px 0 0 40px;
+}
+
+#yui-history-iframe {
+ position:absolute;
+ top:0;
+ left:0;
+ width:1px;
+ height:1px;
+ visibility:hidden;
+}
+
+#control_group_id {
+ width: 250px;
+}
+
+#select-wrp {
+ margin: 10px;
+ padding: 10px;
+ width: 25%;
+}
+
+#control_location #queryForm{
+ margin: 20px;
+ width: 65%;
+}
+
+table.yui-skin-sam {
+ border: 0;
+ padding: 0;
+ margin: 0;
+}
+
+#details table{
+ padding: 10px;
+ margin: 10px;
+ text-align: left;
+ margin-left: 1em;
+}
+
+#details table td{
+ text-align: left;
+ padding-right: 10px;
+}
+
+
+.yui-skin-sam td.auto{
+ width: 160px;
+}
+
+.yui-skin-sam div.auto{
+ width: 140px;
+}
+
+.yui-skin-sam thead{
+ background: none;
+}
+
+p.no_items_msg {
+ padding: 5px;
+}
+
+.no-comp-msg {
+ font-size: 16px;
+ padding-left: 12px;
+}
+
+.option-list-heading {
+ margin: 0 0 10px;
+}
+
+.option-list{
+ margin-top: 5px;
+}
+
+.option-list{
+ padding-left:10px;
+}
+
+.option-list li{
+ margin-bottom: 5px;
+}
+
+.input_error_msg {
+ background: none repeat scroll 0 0 #FBE3E4;
+ border-bottom-right-radius: 4px;
+ color: #D12F19;
+ display: block;
+ margin-bottom: 5px;
+ margin-top: 5px;
+ padding: 5px;
+ text-align: center;
+ width: 90%;
+}
+
+.error_msg {
+ color: red;
+ display: none;
+ font-size: 14px;
+ padding: 7px 0;
+}
+
+.help_text {
+ background: none repeat scroll 0 0 #CCDBED;
+ color: #414851;
+ display: none;
+ padding: 6px 10px 5px;
+ text-align: center;
+ vertical-align: baseline;
+}
+
+.help_text.line {
+ margin-left: 5px;
+}
+
+.help_text.below {
+ margin-left: 0;
+ width: 505px;
+}
+
+
+.yui-navset .content-wrp {
+ margin-top: 0;
+}
+
+
Modified: branches/Version-1_0-branch/property/templates/base/location_form.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/location_form.xsl
2012-12-04 10:06:40 UTC (rev 10568)
+++ branches/Version-1_0-branch/property/templates/base/location_form.xsl
2012-12-04 10:09:44 UTC (rev 10569)
@@ -5,23 +5,21 @@
<!-- New template-->
<xsl:template match="location_data">
- <script type="text/javascript">
- self.name="first_Window";
- <xsl:value-of select="lookup_functions"/>
- </script>
<xsl:for-each select="location">
<tr>
<td class="th_text" width="{with}"
align="{align}" title="{statustext}">
- <xsl:choose>
- <xsl:when test="lookup_link=1">
- <a
href="javascript:{lookup_function_call}" title="{statustext}">
+ <label>
+ <xsl:choose>
+ <xsl:when
test="lookup_link=1">
+ <a
href="javascript:{lookup_function_call}" title="{statustext}">
+
<xsl:value-of select="name"/>
+ </a>
+ </xsl:when>
+ <xsl:otherwise>
<xsl:value-of
select="name"/>
- </a>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="name"/>
- </xsl:otherwise>
- </xsl:choose>
+ </xsl:otherwise>
+ </xsl:choose>
+ </label>
</td>
<td>
<xsl:choose>
Copied: branches/Version-1_0-branch/property/templates/base/location_form2.xsl
(from rev 10568, trunk/property/templates/base/location_form2.xsl)
===================================================================
--- branches/Version-1_0-branch/property/templates/base/location_form2.xsl
(rev 0)
+++ branches/Version-1_0-branch/property/templates/base/location_form2.xsl
2012-12-04 10:09:44 UTC (rev 10569)
@@ -0,0 +1,70 @@
+ <!-- $Id$ -->
+ <xsl:template name="location_form2">
+ <xsl:apply-templates select="location_data2"/>
+ </xsl:template>
+
+ <!-- New template-->
+ <xsl:template match="location_data2"
xmlns:formvalidator="http://www.w3.org/TR/html4/";
xmlns:php="http://php.net/xsl";>
+ <xsl:for-each select="location">
+ <dt>
+ <label title="{statustext}">
+ <xsl:choose>
+ <xsl:when test="lookup_link=1">
+ <a
href="javascript:{lookup_function_call}" title="{statustext}">
+ <xsl:value-of
select="name"/>
+ </a>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="name"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </label>
+ </dt>
+ <dd>
+ <xsl:choose>
+ <xsl:when test="readonly=1">
+ <input size="{size}"
type="{input_type}" name="{input_name}" value="{value}"
onClick="{lookup_function_call}" readonly="readonly">
+ <xsl:if
test="input_type != 'hidden' and required = 1">
+ <xsl:attribute
name="title">
+
<xsl:value-of select="statustext"/>
+ </xsl:attribute>
+ <xsl:attribute
name="formvalidator:FormField">
+
<xsl:text>yes</xsl:text>
+ </xsl:attribute>
+ <xsl:attribute
name="formvalidator:Type">
+
<xsl:text>TextBaseField</xsl:text>
+ </xsl:attribute>
+ </xsl:if>
+ </input>
+ </xsl:when>
+ <xsl:otherwise>
+ <input size="{size}"
type="{input_type}" name="{input_name}" value="{value}"
onClick="{lookup_function_call}">
+ <xsl:if
test="input_type != 'hidden'">
+ <xsl:attribute
name="title">
+
<xsl:value-of select="statustext"/>
+ </xsl:attribute>
+ </xsl:if>
+ </input>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:for-each select="extra">
+ <xsl:choose>
+ <xsl:when test="readonly=1">
+ <input size="{size}"
type="{input_type}" name="{input_name}" value="{value}"
onClick="{lookup_function_call}" readonly="readonly">
+ <xsl:attribute
name="title">
+
<xsl:value-of select="statustext"/>
+ </xsl:attribute>
+ </input>
+ </xsl:when>
+ <xsl:otherwise>
+ <input size="{size}"
type="{input_type}" name="{input_name}" value="{value}"
onClick="{lookup_function_call}">
+ <xsl:attribute
name="title">
+
<xsl:value-of select="statustext"/>
+ </xsl:attribute>
+ </input>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
+ </dd>
+ </xsl:for-each>
+ </xsl:template>
Modified: branches/Version-1_0-branch/property/templates/base/location_view.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/location_view.xsl
2012-12-04 10:06:40 UTC (rev 10568)
+++ branches/Version-1_0-branch/property/templates/base/location_view.xsl
2012-12-04 10:09:44 UTC (rev 10569)
@@ -10,7 +10,9 @@
<xsl:when test="value !=''">
<tr>
<td class="th_text"
width="{with}" align="left">
- <xsl:value-of
select="name"/>
+ <label>
+ <xsl:value-of
select="name"/>
+ </label>
</td>
<td align="left">
<xsl:choose>
Copied: branches/Version-1_0-branch/property/templates/base/location_view2.xsl
(from rev 10568, trunk/property/templates/base/location_view2.xsl)
===================================================================
--- branches/Version-1_0-branch/property/templates/base/location_view2.xsl
(rev 0)
+++ branches/Version-1_0-branch/property/templates/base/location_view2.xsl
2012-12-04 10:09:44 UTC (rev 10569)
@@ -0,0 +1,42 @@
+ <!-- $Id$ -->
+ <xsl:template name="location_view2">
+ <xsl:apply-templates select="location_data2"/>
+ </xsl:template>
+
+ <!-- New template-->
+ <xsl:template match="location_data2">
+ <xsl:for-each select="location">
+ <xsl:choose>
+ <xsl:when test="value !=''">
+ <dt>
+ <label><xsl:value-of
select="name"/></label>
+ </dt>
+ <dd align="left">
+ <xsl:choose>
+ <xsl:when
test="input_type !='hidden'">
+ <xsl:choose>
+
<xsl:when test="query_link !=''">
+
<xsl:variable name="query_link" select="query_link"/>
+
<a href="{$query_link}" class="th_text">
+
<xsl:value-of select="value"/>
+
</a>
+
</xsl:when>
+
<xsl:otherwise>
+
<xsl:value-of select="value"/>
+
</xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+ </xsl:choose>
+ <xsl:for-each select="extra">
+ <xsl:choose>
+ <xsl:when
test="input_type !='hidden'">
+
<xsl:text> </xsl:text>
+
<xsl:value-of select="value"/>
+ </xsl:when>
+ </xsl:choose>
+ </xsl:for-each>
+ </dd>
+ </xsl:when>
+ </xsl:choose>
+ </xsl:for-each>
+ </xsl:template>
Modified: branches/Version-1_0-branch/property/templates/base/tts.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/tts.xsl 2012-12-04
10:06:40 UTC (rev 10568)
+++ branches/Version-1_0-branch/property/templates/base/tts.xsl 2012-12-04
10:09:44 UTC (rev 10569)
@@ -13,499 +13,10 @@
<xsl:when test="view2">
<xsl:apply-templates select="view2"/>
</xsl:when>
- <xsl:when test="list2">
- <xsl:apply-templates select="list2"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:apply-templates select="list"/>
- </xsl:otherwise>
</xsl:choose>
</xsl:template>
- <!-- New template-->
- <xsl:template match="list">
- <xsl:variable name="autorefresh">
- <xsl:value-of select="autorefresh"/>
- </xsl:variable>
- <META HTTP-EQUIV="Refresh" CONTENT="{$autorefresh}"/>
- <xsl:apply-templates select="menu"/>
- <table width="100%" cellpadding="2" cellspacing="2"
align="center">
- <xsl:choose>
- <xsl:when test="msgbox_data != ''">
- <tr>
- <td align="left" colspan="3">
- <xsl:call-template
name="msgbox"/>
- </td>
- </tr>
- </xsl:when>
- </xsl:choose>
- <tr>
- <xsl:choose>
- <xsl:when test="group_filters != ''">
- <xsl:variable
name="select_action">
- <xsl:value-of
select="select_action"/>
- </xsl:variable>
- <form method="post"
name="search" action="{$select_action}">
- <td>
-
<xsl:call-template name="categories"/>
- </td>
- <td>
-
<xsl:call-template name="select_district"/>
- </td>
- <td align="center">
-
<xsl:call-template name="filter_select"/>
- </td>
- <td align="center">
-
<xsl:call-template name="user_id_select"/>
- </td>
- <td align="right">
-
<xsl:call-template name="search_field_grouped"/>
- </td>
- </form>
- </xsl:when>
- <xsl:otherwise>
- <td>
- <xsl:call-template
name="categories"/>
- </td>
- <td>
- <xsl:call-template
name="filter_district"/>
- </td>
- <td align="center">
- <xsl:call-template
name="filter_filter"/>
- </td>
- <td align="center">
- <xsl:call-template
name="user_id_filter"/>
- </td>
- <td align="right">
- <xsl:call-template
name="search_field"/>
- </td>
- </xsl:otherwise>
- </xsl:choose>
- <td class="small_text" valign="top"
align="left">
- <xsl:variable name="link_download">
- <xsl:value-of
select="link_download"/>
- </xsl:variable>
- <xsl:variable name="lang_download_help">
- <xsl:value-of
select="lang_download_help"/>
- </xsl:variable>
- <xsl:variable name="lang_download">
- <xsl:value-of
select="lang_download"/>
- </xsl:variable>
- <a href="javascript:var
w=window.open('{$link_download}','','left=50,top=100')"
onMouseOver="overlib('{$lang_download_help}', CAPTION, '{$lang_download}')"
onMouseOut="nd()">
- <xsl:value-of
select="lang_download"/>
- </a>
- </td>
- </tr>
- <tr>
- <td colspan="8" width="100%">
- <xsl:call-template name="nextmatchs"/>
- </td>
- </tr>
- </table>
- <table width="100%" cellpadding="2" cellspacing="2"
align="center">
- <xsl:apply-templates select="table_header"/>
- <xsl:apply-templates select="values"/>
- <xsl:apply-templates select="table_add"/>
- </table>
- </xsl:template>
- <!-- New template-->
- <xsl:template match="table_header">
- <xsl:variable name="lang_priority_statustext">
- <xsl:value-of select="lang_priority_statustext"/>
- </xsl:variable>
- <xsl:variable name="lang_id_statustext">
- <xsl:value-of select="lang_id_statustext"/>
- </xsl:variable>
- <xsl:variable name="lang_opened_by_statustext">
- <xsl:value-of select="lang_opened_by_statustext"/>
- </xsl:variable>
- <xsl:variable name="lang_assigned_to_statustext">
- <xsl:value-of select="lang_assigned_to_statustext"/>
- </xsl:variable>
- <xsl:variable name="lang_finnish_statustext">
- <xsl:value-of select="lang_finnish_statustext"/>
- </xsl:variable>
- <tr class="th">
- <td class="th_text" width="1%" align="right">
- <xsl:variable name="sort_priority">
- <xsl:value-of select="sort_priority"/>
- </xsl:variable>
- <a href="{$sort_priority}"
onMouseover="window.status='{$lang_priority_statustext}';return true;"
onMouseout="window.status='';return true;">
- <xsl:value-of select="lang_priority"/>
- </a>
- </td>
- <td class="th_text" width="6%" align="right">
- <xsl:variable name="sort_id">
- <xsl:value-of select="sort_id"/>
- </xsl:variable>
- <a href="{$sort_id}"
onMouseover="window.status='{$lang_id_statustext}';return true;"
onMouseout="window.status='';return true;">
- <xsl:value-of select="lang_id"/>
- </a>
- </td>
- <td class="th_text" width="10%">
- <xsl:value-of select="lang_subject"/>
- </td>
- <td class="th_text" width="15%" align="left">
- <xsl:value-of select="lang_location_code"/>
- </td>
- <td class="th_text" width="30%" align="left">
- <xsl:value-of select="lang_address"/>
- </td>
- <td class="th_text" width="8%" align="center">
- <xsl:variable name="sort_opened_by">
- <xsl:value-of select="sort_opened_by"/>
- </xsl:variable>
- <a href="{$sort_opened_by}"
onMouseover="window.status='{$lang_opened_by_statustext}';return true;"
onMouseout="window.status='';return true;">
- <xsl:value-of select="lang_opened_by"/>
- </a>
- </td>
- <td class="th_text" width="8%" align="center">
- <xsl:variable name="sort_assigned_to">
- <xsl:value-of
select="sort_assigned_to"/>
- </xsl:variable>
- <a href="{$sort_assigned_to}"
onMouseover="window.status='{$lang_assigned_to_statustext}';return true;"
onMouseout="window.status='';return true;">
- <xsl:value-of
select="lang_assigned_to"/>
- </a>
- </td>
- <td class="th_text" width="8%" align="center">
- <xsl:variable name="sort_date">
- <xsl:value-of select="sort_date"/>
- </xsl:variable>
- <a href="{$sort_date}"
onMouseover="window.status='{$lang_opened_by_statustext}';return true;"
onMouseout="window.status='';return true;">
- <xsl:value-of
select="lang_time_created"/>
- </a>
- </td>
- <xsl:for-each select="extra">
- <td class="th_text" width="{with}"
align="{align}">
- <xsl:value-of select="header"/>
- </td>
- </xsl:for-each>
- <td class="th_text" width="8%" align="center">
- <xsl:variable name="sort_finnish_date">
- <xsl:value-of
select="sort_finnish_date"/>
- </xsl:variable>
- <a href="{$sort_finnish_date}"
onMouseover="window.status='{$lang_finnish_statustext}';return true;"
onMouseout="window.status='';return true;">
- <xsl:value-of
select="lang_finnish_date"/>
- </a>
- </td>
- <td class="th_text" width="15%" align="center">
- <xsl:value-of select="lang_delay"/>
- </td>
- <td class="th_text" width="15%" align="center">
- <xsl:value-of select="lang_status"/>
- </td>
- </tr>
- </xsl:template>
-
- <!-- New template-->
- <xsl:template match="values">
- <xsl:variable name="lang_view_statustext">
- <xsl:value-of select="lang_view_statustext"/>
- </xsl:variable>
- <xsl:variable name="link_view">
- <xsl:value-of select="link_view"/>
- </xsl:variable>
- <tr bgcolor="{bgcolor}">
- <td class="small_text" align="right">
- <xsl:value-of select="priostr"/>
- </td>
- <td class="small_text" align="right">
- <xsl:value-of select="new_ticket"/>
- <a href="{$link_view}"
onMouseover="window.status='{$lang_view_statustext}';return true;"
onMouseout="window.status='';return true;">
- <xsl:value-of select="id"/>
- </a>
- </td>
- <td class="small_text" align="left">
- <xsl:value-of select="subject"/>
- </td>
- <td class="small_text" align="left">
- <xsl:value-of select="location_code"/>
- </td>
- <td class="small_text" align="left">
- <xsl:value-of select="address"/>
- </td>
- <td class="small_text" align="left">
- <xsl:value-of select="user"/>
- </td>
- <td class="small_text" align="left">
- <xsl:value-of select="assignedto"/>
- </td>
- <td class="small_text" align="center">
- <a href="{$link_view}"
onMouseover="window.status='{$lang_view_statustext}';return true;"
onMouseout="window.status='';return true;">
- <xsl:value-of select="date"/>
- </a>
- </td>
- <xsl:for-each select="child_date">
- <td class="small_text">
- <xsl:for-each select="date_info">
- <a href="{link}">
- <xsl:value-of
select="entry_date"/>
- </a>
- <br/>
- </xsl:for-each>
- </td>
- </xsl:for-each>
- <td class="small_text" align="center">
- <xsl:value-of select="finnish_date"/>
- </td>
- <td class="small_text" align="center">
- <xsl:value-of select="delay"/>
- </td>
- <td class="small_text" valign="top" align="center">
- <xsl:choose>
- <xsl:when test="//allow_edit_status !=
''">
- <xsl:variable
name="link_edit_status">
- <xsl:value-of
select="link_edit_status"/>
- </xsl:variable>
- <xsl:variable
name="lang_edit_status">
- <xsl:value-of
select="lang_edit_status"/>
- </xsl:variable>
- <xsl:variable
name="text_edit_status">
- <xsl:value-of
select="text_edit_status"/>
- </xsl:variable>
- <xsl:variable name="status">
- <xsl:value-of
select="status"/>
- </xsl:variable>
- <a href="{$link_edit_status}"
onMouseOver="overlib('{$text_edit_status}', CAPTION, '{$lang_edit_status}')"
onMouseOut="nd()">
- <xsl:value-of
select="status"/>
- </a>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="status"/>
- </xsl:otherwise>
- </xsl:choose>
- </td>
- </tr>
- </xsl:template>
-
- <!-- New template-->
- <xsl:template match="table_add">
- <tr>
- <td height="50">
- <xsl:variable name="add_action">
- <xsl:value-of select="add_action"/>
- </xsl:variable>
- <xsl:variable name="lang_add">
- <xsl:value-of select="lang_add"/>
- </xsl:variable>
- <form method="post" action="{$add_action}">
- <input type="submit" name="add"
value="{$lang_add}" onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
- <xsl:value-of
select="lang_add_statustext"/>
- <xsl:text>'; return
true;</xsl:text>
- </xsl:attribute>
- </input>
- </form>
- </td>
- </tr>
- </xsl:template>
-
- <!-- New template-->
- <xsl:template match="list2">
- <xsl:variable name="autorefresh">
- <xsl:value-of select="autorefresh"/>
- </xsl:variable>
- <META HTTP-EQUIV="Refresh" CONTENT="{$autorefresh}"/>
- <xsl:apply-templates select="menu"/>
- <table width="100%" cellpadding="2" cellspacing="2"
align="center">
- <xsl:choose>
- <xsl:when test="msgbox_data != ''">
- <tr>
- <td align="left" colspan="3">
- <xsl:call-template
name="msgbox"/>
- </td>
- </tr>
- </xsl:when>
- </xsl:choose>
- <tr>
- <td align="left">
- <xsl:call-template
name="filter_filter"/>
- </td>
- <td colspan="10" align="right">
- <xsl:call-template name="search_field"/>
- </td>
- <td class="small_text" valign="top"
align="left">
- <xsl:variable name="link_download">
- <xsl:value-of
select="link_download"/>
- </xsl:variable>
- <xsl:variable name="lang_download_help">
- <xsl:value-of
select="lang_download_help"/>
- </xsl:variable>
- <xsl:variable name="lang_download">
- <xsl:value-of
select="lang_download"/>
- </xsl:variable>
- <a href="javascript:var
w=window.open('{$link_download}','','left=50,top=100')"
onMouseOver="overlib('{$lang_download_help}', CAPTION, '{$lang_download}')"
onMouseOut="nd()">
- <xsl:value-of
select="lang_download"/>
- </a>
- </td>
- </tr>
- <tr>
- <td colspan="12" width="100%">
- <xsl:call-template name="nextmatchs"/>
- </td>
- </tr>
- </table>
- <table width="100%" cellpadding="2" cellspacing="2"
align="center">
- <xsl:apply-templates select="table_header2"/>
- <xsl:apply-templates select="values2"/>
- <xsl:apply-templates select="table_add"/>
- </table>
- </xsl:template>
-
- <!-- New template-->
- <xsl:template match="table_header2">
- <xsl:variable name="lang_priority_statustext">
- <xsl:value-of select="lang_priority_statustext"/>
- </xsl:variable>
- <xsl:variable name="lang_id_statustext">
- <xsl:value-of select="lang_id_statustext"/>
- </xsl:variable>
- <xsl:variable name="lang_opened_by_statustext">
- <xsl:value-of select="lang_opened_by_statustext"/>
- </xsl:variable>
- <xsl:variable name="lang_assigned_to_statustext">
- <xsl:value-of select="lang_assigned_to_statustext"/>
- </xsl:variable>
- <xsl:variable name="lang_finnish_statustext">
- <xsl:value-of select="lang_finnish_statustext"/>
- </xsl:variable>
- <tr class="th">
- <td class="th_text" width="1%" align="right">
- <xsl:variable name="sort_priority">
- <xsl:value-of select="sort_priority"/>
- </xsl:variable>
- <a href="{$sort_priority}"
onMouseover="window.status='{$lang_priority_statustext}';return true;"
onMouseout="window.status='';return true;">
- <xsl:value-of select="lang_priority"/>
- </a>
- </td>
- <td class="th_text" width="6%" align="right">
- <xsl:variable name="sort_id">
- <xsl:value-of select="sort_id"/>
- </xsl:variable>
- <a href="{$sort_id}"
onMouseover="window.status='{$lang_id_statustext}';return true;"
onMouseout="window.status='';return true;">
- <xsl:value-of select="lang_id"/>
- </a>
- </td>
- <td class="th_text" width="10%">
- <xsl:value-of select="lang_subject"/>
- </td>
- <td class="th_text" width="15%" align="left">
- <xsl:value-of select="lang_location_code"/>
- </td>
- <td class="th_text" width="30%" align="left">
- <xsl:value-of select="lang_address"/>
- </td>
- <td class="th_text" width="8%" align="center">
- <xsl:variable name="sort_opened_by">
- <xsl:value-of select="sort_opened_by"/>
- </xsl:variable>
- <a href="{$sort_opened_by}"
onMouseover="window.status='{$lang_opened_by_statustext}';return true;"
onMouseout="window.status='';return true;">
- <xsl:value-of select="lang_opened_by"/>
- </a>
- </td>
- <td class="th_text" width="8%" align="center">
- <xsl:variable name="sort_assigned_to">
- <xsl:value-of
select="sort_assigned_to"/>
- </xsl:variable>
- <a href="{$sort_assigned_to}"
onMouseover="window.status='{$lang_assigned_to_statustext}';return true;"
onMouseout="window.status='';return true;">
- <xsl:value-of
select="lang_assigned_to"/>
- </a>
- </td>
- <td class="th_text" width="8%" align="center">
- <xsl:variable name="sort_date">
- <xsl:value-of select="sort_date"/>
- </xsl:variable>
- <a href="{$sort_date}"
onMouseover="window.status='{$lang_opened_by_statustext}';return true;"
onMouseout="window.status='';return true;">
- <xsl:value-of
select="lang_time_created"/>
- </a>
- </td>
- <xsl:for-each select="extra">
- <td class="th_text" width="{with}"
align="{align}">
- <xsl:value-of select="header"/>
- </td>
- </xsl:for-each>
- <td class="th_text" width="8%" align="center">
- <xsl:variable name="sort_finnish_date">
- <xsl:value-of
select="sort_finnish_date"/>
- </xsl:variable>
- <a href="{$sort_finnish_date}"
onMouseover="window.status='{$lang_finnish_statustext}';return true;"
onMouseout="window.status='';return true;">
- <xsl:value-of
select="lang_finnish_date"/>
- </a>
- </td>
- <td class="th_text" width="15%" align="center">
- <xsl:value-of select="lang_delay"/>
- </td>
- <td class="th_text" width="15%" align="center">
- <xsl:value-of select="lang_status"/>
- </td>
- </tr>
- </xsl:template>
-
- <!-- New template-->
- <xsl:template match="values2">
- <xsl:variable name="lang_view_statustext">
- <xsl:value-of select="lang_view_statustext"/>
- </xsl:variable>
- <xsl:variable name="link_view">
- <xsl:value-of select="link_view"/>
- </xsl:variable>
- <tr bgcolor="{bgcolor}">
- <td class="small_text" align="right">
- <xsl:value-of select="priostr"/>
- </td>
- <td class="small_text" align="right">
- <xsl:value-of select="new_ticket"/>
- <a href="{$link_view}"
onMouseover="window.status='{$lang_view_statustext}';return true;"
onMouseout="window.status='';return true;">
- <xsl:value-of select="id"/>
- </a>
- </td>
- <td class="small_text" align="left">
- <xsl:value-of select="subject"/>
- </td>
- <td class="small_text" align="left">
- <xsl:value-of select="location_code"/>
- </td>
- <td class="small_text" align="left">
- <xsl:value-of select="address"/>
- </td>
- <td class="small_text" align="center">
- <xsl:value-of select="user"/>
- </td>
- <td class="small_text" align="center">
- <xsl:value-of select="assignedto"/>
- </td>
- <td class="small_text" align="center">
- <a href="{$link_view}"
onMouseover="window.status='{$lang_view_statustext}';return true;"
onMouseout="window.status='';return true;">
- <xsl:value-of select="date"/>
- </a>
- </td>
- <xsl:for-each select="child_date">
- <td class="small_text">
- <xsl:for-each select="date_info">
- <xsl:variable name="link">
- <xsl:value-of
select="link"/>
- </xsl:variable>
- <a href="{$link}"
onMouseover="window.status='';return true;" onMouseout="window.status='';return
true;">
- <xsl:value-of
select="entry_date"/>
- </a>
- <br/>
- </xsl:for-each>
- </td>
- </xsl:for-each>
- <td class="small_text" align="center">
- <xsl:value-of select="finnish_date"/>
- </td>
- <td class="small_text" align="center">
- <xsl:value-of select="delay"/>
- </td>
- <td class="small_text" align="center">
- <xsl:value-of select="status"/>
- </td>
- </tr>
- </xsl:template>
-
<!-- add -->
<xsl:template xmlns:php="http://php.net/xsl"; match="add">
<script type="text/javascript">
@@ -532,7 +43,9 @@
<xsl:for-each
select="value_origin">
<tr>
<td
valign="top">
-
<xsl:value-of select="descr"/>
+ <label>
+
<xsl:value-of select="descr"/>
+ </label>
</td>
<td>
<table>
@@ -556,7 +69,9 @@
<xsl:call-template
name="location_form"/>
<tr>
<td>
- <xsl:value-of
select="lang_category"/>
+ <label>
+
<xsl:value-of select="php:function('lang', 'category')"/>
+ </label>
</td>
<td>
<xsl:call-template name="categories"/>
@@ -566,7 +81,9 @@
<xsl:when test="simple
!='1'">
<tr>
<td
valign="top">
-
<xsl:value-of select="php:function('lang', 'Group')"/>
+
<label>
+
<xsl:value-of select="php:function('lang', 'Group')"/>
+
</label>
</td>
<td>
<xsl:call-template name="group_select"/>
@@ -574,7 +91,9 @@
</tr>
<tr>
<td
valign="top">
-
<xsl:value-of select="php:function('lang', 'Assign to')"/>
+
<label>
+
<xsl:value-of select="php:function('lang', 'Assign to')"/>
+
</label>
</td>
<td>
<xsl:call-template name="user_id_select"/>
@@ -583,7 +102,9 @@
<xsl:call-template name="contact_form"/>
<tr>
<td>
+
<label>
<xsl:value-of select="php:function('lang', 'Send e-mail')"/>
+
</label>
</td>
<td>
<input type="checkbox" name="values[send_mail]" value="1">
@@ -600,7 +121,9 @@
</tr>
<tr>
<td
valign="top">
-
<xsl:value-of select="php:function('lang', 'Priority')"/>
+
<label>
+
<xsl:value-of select="php:function('lang', 'Priority')"/>
+
</label>
</td>
<td>
<xsl:variable name="lang_priority_statustext">
@@ -616,7 +139,9 @@
</tr>
<tr>
<td
valign="top">
-
<xsl:value-of select="php:function('lang', 'status')"/>
+
<label>
+
<xsl:value-of select="php:function('lang', 'status')"/>
+
</label>
</td>
<td>
<select name="values[status]">
@@ -631,7 +156,9 @@
<xsl:when test="show_finnish_date ='1'">
<tr>
<td>
-
<xsl:value-of select="php:function('lang', 'finnish date')"/>
+
<label>
+
<xsl:value-of select="php:function('lang', 'finnish
date')"/>
+
</label>
</td>
<td>
<input type="text" id="values_finnish_date"
name="values[finnish_date]" size="10" value="{value_finnish_date}"
readonly="readonly" onMouseout="window.status='';return true;">
@@ -648,7 +175,9 @@
<xsl:apply-templates
select="custom_attributes/attributes"/>
<tr>
<td valign="top">
- <xsl:value-of
select="php:function('lang', 'subject')"/>
+ <label>
+
<xsl:value-of select="php:function('lang', 'subject')"/>
+ </label>
</td>
<td>
<input
type="text" name="values[subject]" value="{value_subject}"
onMouseout="window.status='';return true;">
@@ -660,7 +189,9 @@
</tr>
<tr>
<td valign="top">
- <xsl:value-of
select="php:function('lang', 'Details')"/>
+ <label>
+
<xsl:value-of select="php:function('lang', 'Details')"/>
+ </label>
</td>
<td>
<textarea
cols="60" rows="10" name="values[details]" onMouseout="window.status='';return
true;">
@@ -675,10 +206,12 @@
<xsl:when
test="fileupload = 1">
<tr>
<td
valign="top">
-
<xsl:value-of select="lang_upload_file"/>
+
<label>
+
<xsl:value-of select="lang_upload_file"/>
+
</label>
</td>
<td>
-
<input type="file" name="file" size="40" onMouseout="window.status='';return
true;">
+
<input type="file" name="file" size="40">
<xsl:attribute name="title">
<xsl:value-of select="lang_file_statustext"/>
</xsl:attribute>
@@ -881,7 +414,9 @@
<table cellpadding="2"
cellspacing="2" width="95%" align="center">
<tr class="th">
<td
class="th_text" valign="top">
-
<xsl:value-of select="php:function('lang', 'Ticket')"/>
+ <label>
+
<xsl:value-of select="php:function('lang', 'Ticket')"/>
+ </label>
</td>
<td
class="th_text" valign="top">
<xsl:value-of select="value_id"/>
@@ -895,7 +430,9 @@
<xsl:for-each
select="value_origin">
<tr>
<td
valign="top">
-
<xsl:value-of select="descr"/>
+
<label>
+
<xsl:value-of select="descr"/>
+
</label>
</td>
<td>
<table>
@@ -925,7 +462,9 @@
<xsl:when
test="contact_phone !=''">
<tr>
<td class="th_text" align="left">
-
<xsl:value-of select="php:function('lang', 'Contact phone')"/>
+
<label>
+
<xsl:value-of select="php:function('lang', 'Contact phone')"/>
+
</label>
</td>
<td align="left">
<xsl:value-of select="contact_phone"/>
@@ -937,7 +476,9 @@
<xsl:for-each
select="value_target">
<tr>
<td
class="th_text" valign="top">
-
<xsl:value-of select="descr"/>
+
<label>
+
<xsl:value-of select="descr"/>
+
</label>
</td>
<td
class="th_text" align="left">
<xsl:for-each select="data">
@@ -951,19 +492,22 @@
</xsl:for-each>
<tr>
<td
class="th_text" valign="top">
-
<xsl:value-of select="php:function('lang', 'details')"/>
+ <label>
+
<xsl:value-of select="php:function('lang', 'details')"/>
+ </label>
</td>
<xsl:choose>
<xsl:when test="additional_notes=''">
<td class="th_text">
-
<xsl:value-of select="php:function('lang', 'no additional notes')"/>
+
<label>
+
<xsl:value-of select="php:function('lang', 'no additional
notes')"/>
+
</label>
</td>
</xsl:when>
<xsl:otherwise>
<td>
<table width="100%" cellpadding="2" cellspacing="2" align="center">
<!-- DATATABLE 0-->
-
<!-- <xsl:apply-templates
select="table_header_additional_notes"/><xsl:apply-templates
select="additional_notes"/>-->
<td>
<div id="paging_0"/>
<div id="datatable-container_0"/>
@@ -977,7 +521,9 @@
<xsl:when
test="simple !='1'">
<tr>
<td valign="top">
-
<xsl:value-of select="php:function('lang', 'group')"/>
+
<label>
+
<xsl:value-of select="php:function('lang', 'group')"/>
+
</label>
</td>
<td>
<xsl:call-template name="group_select"/>
@@ -985,7 +531,9 @@
</tr>
<tr>
<td valign="top">
-
<xsl:value-of select="php:function('lang', 'assigned to')"/>
+
<label>
+
<xsl:value-of select="php:function('lang', 'assigned to')"/>
+
</label>
</td>
<td>
<xsl:call-template name="user_id_select"/>
@@ -995,7 +543,9 @@
<xsl:when test="lang_takeover != ''">
<tr>
<td valign="top">
-
<xsl:value-of select="lang_takeover"/>
+
<label>
+
<xsl:value-of select="lang_takeover"/>
+
</label>
</td>
<td>
<input type="checkbox" name="values[takeover]"
value="1">
@@ -1009,7 +559,9 @@
</xsl:choose>
<tr>
<td>
-
<xsl:value-of select="php:function('lang', 'Send e-mail')"/>
+
<label>
+
<xsl:value-of select="php:function('lang', 'Send e-mail')"/>
+
</label>
</td>
<td>
<input type="checkbox" name="values[send_mail]" value="1">
@@ -1026,7 +578,9 @@
</tr>
<tr>
<td valign="top">
-
<xsl:value-of select="php:function('lang', 'Priority')"/>
+
<label>
+
<xsl:value-of select="php:function('lang', 'Priority')"/>
+
</label>
</td>
<td>
<xsl:variable name="lang_priority_statustext">
@@ -1044,7 +598,9 @@
<xsl:when test="value_order_id=''">
<tr>
<td valign="top">
-
<xsl:value-of select="php:function('lang', 'status')"/>
+
<label>
+
<xsl:value-of select="php:function('lang',
'status')"/>
+
</label>
</td>
<td>
<select name="values[status]" class="forms">
@@ -1059,7 +615,9 @@
</xsl:choose>
<tr>
<td>
-
<xsl:value-of select="php:function('lang', 'category')"/>
+
<label>
+
<xsl:value-of select="php:function('lang', 'category')"/>
+
</label>
</td>
<td>
<xsl:call-template name="categories"/>
@@ -1069,7 +627,9 @@
<xsl:when test="show_finnish_date ='1'">
<tr>
<td>
-
<xsl:value-of select="php:function('lang', 'finnish
date')"/>
+
<label>
+
<xsl:value-of select="php:function('lang',
'finnish date')"/>
+
</label>
</td>
<td>
<input type="text" id="values_finnish_date"
name="values[finnish_date]" size="10" value="{value_finnish_date}"
readonly="readonly" onMouseout="window.status='';return true;">
@@ -1085,7 +645,9 @@
<xsl:when test="show_billable_hours ='1'">
<tr>
<td>
-
<xsl:value-of select="php:function('lang', 'billable
hours')"/>
+
<label>
+
<xsl:value-of select="php:function('lang',
'billable hours')"/>
+
</label>
</td>
<td>
<input type="text" id="values_billable_hour"
name="values[billable_hours]" size="10" value="{value_billable_hours}">
@@ -1111,7 +673,9 @@
<xsl:apply-templates
select="custom_attributes/attributes"/>
<tr>
<td
valign="top">
-
<xsl:value-of select="php:function('lang', 'new note')"/>
+ <label>
+
<xsl:value-of select="php:function('lang', 'new note')"/>
+ </label>
</td>
<td>
<textarea cols="{textareacols}" rows="{textarearows}" name="values[note]">
@@ -1125,7 +689,9 @@
<xsl:when
test="fileupload = 1">
<tr>
<td width="19%" align="left" valign="top">
-
<xsl:value-of select="php:function('lang', 'files')"/>
+
<label>
+
<xsl:value-of select="php:function('lang', 'files')"/>
+
</label>
</td>
<td>
<div id="datatable-container_2"/>
@@ -1145,7 +711,9 @@
<xsl:when
test="send_response = 1">
<tr>
<td class="th_text" align="left">
-
<xsl:value-of select="php:function('lang', 'notify client by sms')"/>
+
<label>
+
<xsl:value-of select="php:function('lang', 'notify client by
sms')"/>
+
</label>
</td>
<td align="left">
<table>
@@ -1170,12 +738,14 @@
</tr>
<tr>
<td valign="top">
-
<a href="javascript:response_lookup()">
-
<xsl:attribute name="title">
+
<label>
+
<a href="javascript:response_lookup()">
+
<xsl:attribute name="title">
+
<xsl:value-of select="php:function('lang',
'response')"/>
+
</xsl:attribute>
<xsl:value-of select="php:function('lang',
'response')"/>
-
</xsl:attribute>
-
<xsl:value-of select="php:function('lang', 'response')"/>
-
</a>
+
</a>
+
</label>
</td>
<td>
<textarea cols="{textareacols}" rows="{textarearows}"
id="response_text" name="values[response_text]" onKeyUp="javascript:
SmsCountKeyUp(160);" onKeyDown="javascript: SmsCountKeyDown(160);"
wrap="virtual">
@@ -1188,7 +758,9 @@
</tr>
<tr>
<td>
-
<xsl:value-of select="php:function('lang', 'character left')"/>
+
<label>
+
<xsl:value-of select="php:function('lang', 'character left')"/>
+
</label>
</td>
<td>
<input type="text" readonly="readonly" size="3" maxlength="3"
name="charNumberLeftOutput" id="charNumberLeftOutput" value="160">
@@ -1203,7 +775,9 @@
<xsl:when test="value_order_id=''">
<tr>
<td>
-
<xsl:value-of select="php:function('lang', 'make
order')"/>
+
<label>
+
<xsl:value-of select="php:function('lang',
'make order')"/>
+
</label>
</td>
<td>
<input type="checkbox" name="values[make_order]"
value="True">
@@ -1219,7 +793,9 @@
<xsl:when test="value_order_id!=''">
<tr class="th">
<td class="th_text">
-
<xsl:value-of select="php:function('lang', 'order
id')"/>
+
<label>
+
<xsl:value-of select="php:function('lang',
'order id')"/>
+
</label>
</td>
<td>
<xsl:value-of select="value_order_id"/>
@@ -1228,7 +804,9 @@
</tr>
<tr>
<td>
-
<xsl:value-of select="php:function('lang', 'on behalf
of assigned')"/>
+
<label>
+
<xsl:value-of select="php:function('lang', 'on
behalf of assigned')"/>
+
</label>
</td>
<td>
<input type="checkbox"
name="values[on_behalf_of_assigned]" value="True">
@@ -1243,7 +821,9 @@
<xsl:call-template name="b_account_form"/>
<tr>
<td>
-
<xsl:value-of select="php:function('lang', 'building
part')"/>
+
<label>
+
<xsl:value-of select="php:function('lang',
'building part')"/>
+
</label>
</td>
<td>
<select name="values[building_part]">
@@ -1261,7 +841,9 @@
<xsl:when test="branch_list!=''">
<tr>
<td>
-
<xsl:value-of
select="php:function('lang', 'branch')"/>
+
<label>
+
<xsl:value-of
select="php:function('lang', 'branch')"/>
+
</label>
</td>
<td>
<select name="values[branch_id]">
@@ -1279,7 +861,9 @@
</xsl:choose>
<tr>
<td>
-
<xsl:value-of select="php:function('lang',
'order_dim1')"/>
+
<label>
+
<xsl:value-of select="php:function('lang',
'order_dim1')"/>
+
</label>
</td>
<td>
<select name="values[order_dim1]">
@@ -1295,14 +879,18 @@
</tr>
<tr>
<td valign="top">
-
<xsl:value-of select="php:function('lang', 'cost
estimate')"/>
+
<label>
+
<xsl:value-of select="php:function('lang',
'cost estimate')"/>
+
</label>
</td>
<td><input type="text" name="values[budget]"
value="{value_budget}"><xsl:attribute name="title"><xsl:value-of
select="php:function('lang', 'Enter the
budget')"/></xsl:attribute></input><xsl:text> </xsl:text> [ <xsl:value-of
select="currency"/> ]
</td>
</tr>
<tr>
<td valign="top">
-
<xsl:value-of select="php:function('lang', 'actual
cost')"/>
+
<label>
+
<xsl:value-of select="php:function('lang',
'actual cost')"/>
+
</label>
</td>
<td>
<input type="text" name="values[actual_cost]"
value="{value_actual_cost}"><xsl:attribute name="title"><xsl:value-of
select="php:function('lang', 'Enter actual
cost')"/></xsl:attribute></input><!--<xsl:value-of select="value_actual_cost"/>
--><xsl:text> </xsl:text> [ <xsl:value-of select="currency"/> ]
@@ -1310,12 +898,14 @@
</tr>
<tr>
<td valign="top">
-
<a href="javascript:template_lookup()">
-
<xsl:attribute name="title">
-
<xsl:value-of
select="php:function('lang', 'lookup template')"/>
-
</xsl:attribute>
-
<xsl:value-of select="php:function('lang',
'description')"/>
-
</a>
+
<label>
+
<a href="javascript:template_lookup()">
+
<xsl:attribute name="title">
+
<xsl:value-of
select="php:function('lang', 'lookup template')"/>
+
</xsl:attribute>
+
<xsl:value-of
select="php:function('lang', 'description')"/>
+
</a>
+
</label>
</td>
<td>
<textarea cols="{textareacols}" rows="{textarearows}"
id="order_descr" name="values[order_descr]" wrap="virtual">
@@ -1330,7 +920,9 @@
<xsl:when test="need_approval='1'">
<tr>
<td valign="top">
-
<xsl:value-of
select="php:function('lang', 'ask for approval')"/>
+
<label>
+
<xsl:value-of
select="php:function('lang', 'ask for approval')"/>
+
</label>
</td>
<td>
@@ -1363,7 +955,9 @@
</xsl:choose>
<tr>
<td valign="top">
-
<xsl:value-of select="php:function('lang', 'send
order')"/>
+
<label>
+
<xsl:value-of select="php:function('lang',
'send order')"/>
+
</label>
</td>
<td>
<div id="paging_3"/>
@@ -1371,7 +965,9 @@
</td>
<tr>
<td valign="top">
-
<xsl:value-of select="php:function('lang',
'extra mail address')"/>
+
<label>
+
<xsl:value-of
select="php:function('lang', 'extra mail address')"/>
+
</label>
</td>
<td>
<input type="text"
name="values[vendor_email][]" value="">
@@ -1384,7 +980,9 @@
</tr>
<tr>
<td valign="top">
-
<xsl:value-of select="php:function('lang', 'status')"/>
+
<label>
+
<xsl:value-of select="php:function('lang',
'status')"/>
+
</label>
</td>
<td>
<select name="values[status]" class="forms">
@@ -1403,7 +1001,9 @@
<xsl:when test="value_order_id!=''">
<tr class="th">
<td class="th_text">
-
<xsl:value-of select="php:function('lang', 'order
id')"/>
+
<label>
+
<xsl:value-of select="php:function('lang',
'order id')"/>
+
</label>
</td>
<td>
<xsl:value-of select="value_order_id"/>
@@ -1423,9 +1023,11 @@
</xsl:variable>
<tr>
<td
valign="top">
- <a
href="javascript:notify_contact_lookup()" title="{$lang_contact_statustext}">
-
<xsl:value-of select="php:function('lang', 'contact')"/>
- </a>
+ <label>
+
<a href="javascript:notify_contact_lookup()" title="{$lang_contact_statustext}">
+
<xsl:value-of select="php:function('lang', 'contact')"/>
+
</a>
+ </label>
</td>
<td>
<table>
@@ -1441,7 +1043,9 @@
</tr>
<tr>
<td
valign="top" class="th_text">
-
<xsl:value-of select="php:function('lang', 'notify')"/>
+ <label>
+
<xsl:value-of select="php:function('lang', 'notify')"/>
+ </label>
</td>
<td>
<div
id="paging_4"> </div>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10569] Merge 10544:10568 from trunk,
Sigurd Nes <=