[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9507] Merge 9503:9506 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9507] Merge 9503:9506 from trunk |
|
Date: |
Tue, 05 Jun 2012 08:03:34 +0000 |
Revision: 9507
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9507
Author: sigurdne
Date: 2012-06-05 08:03:34 +0000 (Tue, 05 Jun 2012)
Log Message:
-----------
Merge 9503:9506 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
branches/Version-1_0-branch/activitycalendar/inc/class.soarena.inc.php
branches/Version-1_0-branch/activitycalendar/inc/class.sogroup.inc.php
branches/Version-1_0-branch/activitycalendar/inc/class.soorganization.inc.php
branches/Version-1_0-branch/activitycalendar/inc/class.uiorganization.inc.php
branches/Version-1_0-branch/activitycalendar/templates/base/activity.php
branches/Version-1_0-branch/activitycalendar/templates/base/arena.php
branches/Version-1_0-branch/activitycalendar/templates/base/group.php
branches/Version-1_0-branch/activitycalendar/templates/base/organization.php
branches/Version-1_0-branch/controller/templates/base/component.xsl
branches/Version-1_0-branch/controller/templates/base/css/base.css
branches/Version-1_0-branch/controller/templates/base/datatable.xsl
branches/Version-1_0-branch/controller/templates/base/procedure/view_procedures_for_control.xsl
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,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
+
/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
Modified:
branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
2012-06-05 07:50:44 UTC (rev 9506)
+++ branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
2012-06-05 08:03:34 UTC (rev 9507)
@@ -1362,7 +1362,7 @@
$activity->set_title($this->unmarshal($this->db->f('title'), 'string'));
$activity->set_organization_id($this->unmarshal($this->db->f('organization_id'),
'int'));
$activity->set_group_id($this->unmarshal($this->db->f('group_id'), 'int'));
-
$activity->set_district($this->unmarshal($this->db->f('district'), 'int'));
+
$activity->set_district($this->unmarshal($this->db->f('district'), 'string'));
$activity->set_office($this->unmarshal($this->db->f('office'), 'int'));
$activity->set_category($this->unmarshal($this->db->f('category'), 'int'));
$activity->set_state($this->unmarshal($this->db->f('state'), 'int'));
Modified: branches/Version-1_0-branch/activitycalendar/inc/class.soarena.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/inc/class.soarena.inc.php
2012-06-05 07:50:44 UTC (rev 9506)
+++ branches/Version-1_0-branch/activitycalendar/inc/class.soarena.inc.php
2012-06-05 08:03:34 UTC (rev 9507)
@@ -289,13 +289,18 @@
public function get_address($search)
{
$result_arr = array();
+ $curr_index=0;
if($search)
{
$sql = "select * from fm_streetaddress where
UPPER(descr) like UPPER('{$search}%')";
$this->db->query($sql, __LINE__, __FILE__);
while($this->db->next_record()){
//$result_arr = $this->db->f('name');
+ //if($curr_index == 0){
+ //$result_arr[] = "<option value='0'>Velg
gateadresse</option>";
+ //}
$result_arr[] = "<option value='" .
$this->db->f('descr') . "'>" . $this->db->f('descr') . "</option>";
+ //$curr_index++;
}
}
$result = implode(' ' , $result_arr);
Modified: branches/Version-1_0-branch/activitycalendar/inc/class.sogroup.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/inc/class.sogroup.inc.php
2012-06-05 07:50:44 UTC (rev 9506)
+++ branches/Version-1_0-branch/activitycalendar/inc/class.sogroup.inc.php
2012-06-05 08:03:34 UTC (rev 9507)
@@ -87,7 +87,7 @@
if(isset($filters['new_groups'])){
$use_local_group = true;
unset($filter_clauses);
- $filter_clauses[] = "activity_group.change_type =
'new'";
+ $filter_clauses[] = "activity_group.change_type = 'new'
OR activity_group.change_type = 'change' ";
if(isset($filters[$this->get_id_field_name()])){
$id =
$this->marshal($filters[$this->get_id_field_name()],'int');
$filter_clauses[] = "activity_group.id = {$id}";
Modified:
branches/Version-1_0-branch/activitycalendar/inc/class.soorganization.inc.php
===================================================================
---
branches/Version-1_0-branch/activitycalendar/inc/class.soorganization.inc.php
2012-06-05 07:50:44 UTC (rev 9506)
+++
branches/Version-1_0-branch/activitycalendar/inc/class.soorganization.inc.php
2012-06-05 08:03:34 UTC (rev 9507)
@@ -114,7 +114,7 @@
//$id =
$this->marshal($filters[$this->get_id_field_name()],'int');
//$filter_clauses[] = "org.id = {$id}";
unset($filter_clauses);
- $filter_clauses[] = "org.change_type = 'new'";
+ $filter_clauses[] = "org.change_type = 'new' OR
org.change_type = 'change' ";
if(isset($filters[$this->get_id_field_name()])){
$id =
$this->marshal($filters[$this->get_id_field_name()],'int');
$filter_clauses[] = "org.id = {$id}";
Modified:
branches/Version-1_0-branch/activitycalendar/inc/class.uiorganization.inc.php
===================================================================
---
branches/Version-1_0-branch/activitycalendar/inc/class.uiorganization.inc.php
2012-06-05 07:50:44 UTC (rev 9506)
+++
branches/Version-1_0-branch/activitycalendar/inc/class.uiorganization.inc.php
2012-06-05 08:03:34 UTC (rev 9507)
@@ -171,13 +171,15 @@
$group_org_id =
$sogroup->get_orgid_from_group($new_group_id);
//get affected activities and update
with new org id
- $update_activities =
$soactivity->get_activities_for_update($new_group_id, true);
+ $update_activities =
$soactivity->get_activities_for_update($id, true);
+ var_dump($update_activities);
foreach($update_activities as $act)
{
$act->set_organization_id($group_org_id);
$act->set_group_id($new_group_id);
$act->set_new_org(false);
$soactivity->store($act);
+ var_dump($act);
}
//set local group as stored
@@ -185,6 +187,10 @@
$group->set_transferred(true);
$sogroup->update_local($group);
$message = lang('messages_saved_form');
+
+ $contact_persons =
$socontact->get_booking_contact_persons($group->get_id(), true);
+ $cp1 = $contact_persons[0];
+ $cp2 = $contact_persons[1];
}
else
{
@@ -444,6 +450,7 @@
$id = (int)phpgw::get_var('id');
$type = phpgw::get_var('type');
$cancel_link = self::link(array('menuaction' =>
'activitycalendar.uiorganization.changed_organizations'));
+ $socontact = activitycalendar_socontactperson::get_instance();
if($type)
{
if(isset($_POST['edit_group'])) // The user has pressed
the save button
@@ -462,12 +469,17 @@
if(count($group_array) > 0){
$keys = array_keys($group_array);
$group = $group_array[$keys[0]];
- _debug_array($group);
+// _debug_array($group);
}
+ $contact_persons =
$socontact->get_local_contact_persons($group->get_id(), true);
+ $cp1 = $contact_persons[0];
+ $cp2 = $contact_persons[1];
$data = array
(
'group' => $group,
+ 'contactperson1' => $cp1,
+ 'contactperson2' => $cp2,
'cancel_link' => $cancel_link,
'message' => $message,
'errorMsgs' => $errorMsgs,
@@ -495,11 +507,15 @@
$org = $org_array[$keys[0]];
}
- //var_dump($org);
+ $contact_persons =
$socontact->get_local_contact_persons($org->get_id());
+ $cp1 = $contact_persons[0];
+ $cp2 = $contact_persons[1];
$data = array
(
'organization' => $org,
+ 'contactperson1' => $cp1,
+ 'contactperson2' => $cp2,
'cancel_link' => $cancel_link,
'message' => $message,
'errorMsgs' => $errorMsgs,
Modified:
branches/Version-1_0-branch/activitycalendar/templates/base/activity.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/templates/base/activity.php
2012-06-05 07:50:44 UTC (rev 9506)
+++ branches/Version-1_0-branch/activitycalendar/templates/base/activity.php
2012-06-05 08:03:34 UTC (rev 9507)
@@ -33,6 +33,42 @@
}
+function get_address_search_cp2()
+{
+ var address = document.getElementById('contact_person_2_address').value;
+ var div_address = document.getElementById('contact2_address_container');
+ div_address.style.display="block";
+
+ //url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
+ url = "<?php echo
$ajaxURL?>index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
+
+var divcontent_start = "<select name=\"contact2_address_select\"
id=\"address_cp2\" size=\"5\" onChange='setAddressValue(this)'>";
+var divcontent_end = "</select>";
+
+ var callback = {
+ success: function(response){
+ div_address.innerHTML =
divcontent_start + JSON.parse(response.responseText) + divcontent_end;
+ },
+ failure: function(o) {
+ alert("AJAX doesn't work"); //FAILURE
+ }
+ }
+ var trans = YAHOO.util.Connect.asyncRequest('GET', url, callback, null);
+
+}
+
+function setAddressValue(field)
+{
+ if(field.name == 'contact2_address_select')
+ {
+ var address = document.getElementById('contact_person_2_address');
+ var div_address = document.getElementById('contact2_address_container');
+
+ address.value=field.value;
+ div_address.style.display="none";
+ }
+}
+
YAHOO.util.Event.onDOMReady(function()
{
get_available_groups();
@@ -541,7 +577,8 @@
if ($editable)
{
?>
- <input type="text"
name="contact_person_2_address" id="contact_person_2_address" value="<?php echo
$activity->get_contact_person_2_address() ?>" />
+ <input type="text"
name="contact_person_2_address" id="contact_person_2_address" value="<?php echo
$activity->get_contact_person_2_address() ?>"
onkeyup="javascript:get_address_search_cp2()"/>
+ <div
id="contact2_address_container"></div>
<?php
}
else
Modified: branches/Version-1_0-branch/activitycalendar/templates/base/arena.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/templates/base/arena.php
2012-06-05 07:50:44 UTC (rev 9506)
+++ branches/Version-1_0-branch/activitycalendar/templates/base/arena.php
2012-06-05 08:03:34 UTC (rev 9507)
@@ -7,18 +7,18 @@
function get_address_search()
{
- var address = document.getElementById('address_txt').value;
+ var address = document.getElementById('address').value;
var div_address = document.getElementById('address_container');
+ div_address.style.display="block";
url =
"index.php?menuaction=activitycalendar.uiarena.get_address_search&phpgw_return_as=json&search="
+ address;
-var divcontent_start = "<select name=\"address\" id=\"address\" size\"5\">";
+var divcontent_start = "<select name=\"address_select\" id=\"address\"
size=\"5\" onChange='setAddressValue(this)'>";
var divcontent_end = "</select>";
-var divcontent_number = " <label for=\"address_number\"><?php echo
lang('address_number') ?></label><input type=\"text\" name=\"address_no\"
id=\"address_no\" size=\"6\"/>"
var callback = {
success: function(response){
- div_address.innerHTML =
divcontent_start + JSON.parse(response.responseText) + divcontent_end +
divcontent_number;
+ div_address.innerHTML =
divcontent_start + JSON.parse(response.responseText) + divcontent_end;
},
failure: function(o) {
alert("AJAX doesn't work"); //FAILURE
@@ -27,6 +27,16 @@
var trans = YAHOO.util.Connect.asyncRequest('GET', url, callback, null);
}
+
+function setAddressValue(field)
+{
+ var address = document.getElementById('address');
+ var div_address = document.getElementById('address_container');
+
+ address.value=field.value;
+ div_address.style.display="none";
+}
+
</script>
<?php echo activitycalendar_uicommon::get_page_message($message) ?>
<div class="identifier-header">
@@ -75,8 +85,9 @@
if ($editable)
{
?>
- <input type="text"
name="address" id="address_txt" value="<?php echo $arena->get_address() ?>"
onkeyup="javascript:get_address_search()"/>
+ <input type="text"
name="address" id="address" value="<?php echo $arena->get_address() ?>"
onkeyup="javascript:get_address_search()"/>
<div
id="address_container"></div>
+ <label
for="address_number"><?php echo lang('address_number') ?></label><input
type="text" name="address_no" id="address_no" size="6"/>
<?php
}
else
Modified: branches/Version-1_0-branch/activitycalendar/templates/base/group.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/templates/base/group.php
2012-06-05 07:50:44 UTC (rev 9506)
+++ branches/Version-1_0-branch/activitycalendar/templates/base/group.php
2012-06-05 08:03:34 UTC (rev 9507)
@@ -27,15 +27,27 @@
<dd><input type="hidden" name="contact1_id"
value="<?php echo $contactperson1->get_id();?>"/></dd>
<dt><label for="contact1_name">Navn</label></dt>
<dd>
+ <?php if($editable){?>
<input type="text" name="contact1_name"
value="<?php echo $contactperson1->get_name();?>"/><br/>
+ <?php }else{?>
+ <?php echo
$contactperson1->get_name();?>
+ <?php }?>
</dd>
<dt><label
for="contact1_phone">Telefon</label></dt>
<dd>
+ <?php if($editable){?>
<input type="text"
name="contact1_phone" value="<?php echo $contactperson1->get_phone();?>"/>
+ <?php }else{?>
+ <?php echo
$contactperson1->get_phone();?>
+ <?php }?>
</dd>
<dt><label
for="contact1_mail">E-post</label></dt>
<dd>
+ <?php if($editable){?>
<input type="text"
name="contact1_email" value="<?php echo $contactperson1->get_email();?>"/>
+ <?php }else{?>
+ <?php echo
$contactperson1->get_email();?>
+ <?php }?>
</dd>
<?php }?>
<dt><label>Kontaktperson 2</label></dt>
@@ -43,15 +55,27 @@
<dd><input type="hidden" name="contact2_id"
value="<?php echo $contactperson2->get_id();?>"/></dd>
<dt><label for="contact1_name">Navn</label></dt>
<dd>
+ <?php if($editable){?>
<input type="text" name="contact2_name"
value="<?php echo $contactperson2->get_name();?>"/><br/>
+ <?php }else{?>
+ <?php echo
$contactperson2->get_name();?>
+ <?php }?>
</dd>
<dt><label
for="contact1_phone">Telefon</label></dt>
<dd>
+ <?php if($editable){?>
<input type="text"
name="contact2_phone" value="<?php echo $contactperson2->get_phone();?>"/>
+ <?php }else{?>
+ <?php echo
$contactperson2->get_phone();?>
+ <?php }?>
</dd>
<dt><label
for="contact1_mail">E-post</label></dt>
<dd>
+ <?php if($editable){?>
<input type="text"
name="contact2_email" value="<?php echo $contactperson2->get_email();?>"/>
+ <?php }else{?>
+ <?php echo
$contactperson2->get_email();?>
+ <?php }?>
</dd>
<?php }?>
</dl>
Modified:
branches/Version-1_0-branch/activitycalendar/templates/base/organization.php
===================================================================
---
branches/Version-1_0-branch/activitycalendar/templates/base/organization.php
2012-06-05 07:50:44 UTC (rev 9506)
+++
branches/Version-1_0-branch/activitycalendar/templates/base/organization.php
2012-06-05 08:03:34 UTC (rev 9507)
@@ -98,15 +98,27 @@
<dd><input type="hidden" name="contact1_id"
value="<?php echo $contactperson1->get_id();?>"/></dd>
<dt><label for="contact1_name">Navn</label></dt>
<dd>
+ <?php if($editable){?>
<input type="text" name="contact1_name"
value="<?php echo $contactperson1->get_name();?>"/><br/>
+ <?php }else{?>
+ <?php echo
$contactperson1->get_name();?>
+ <?php }?>
</dd>
<dt><label
for="contact1_phone">Telefon</label></dt>
<dd>
+ <?php if($editable){?>
<input type="text"
name="contact1_phone" value="<?php echo $contactperson1->get_phone();?>"/>
+ <?php }else{?>
+ <?php echo
$contactperson1->get_phone();?>
+ <?php }?>
</dd>
<dt><label
for="contact1_mail">E-post</label></dt>
<dd>
+ <?php if($editable){?>
<input type="text"
name="contact1_email" value="<?php echo $contactperson1->get_email();?>"/>
+ <?php }else{?>
+ <?php echo
$contactperson1->get_email();?>
+ <?php }?>
</dd>
<?php }?>
<?php if($contactperson2){?>
@@ -114,15 +126,27 @@
<dd><input type="hidden" name="contact2_id"
value="<?php echo $contactperson2->get_id();?>"/></dd>
<dt><label for="contact1_name">Navn</label></dt>
<dd>
+ <?php if($editable){?>
<input type="text" name="contact2_name"
value="<?php echo $contactperson2->get_name();?>"/><br/>
+ <?php }else{?>
+ <?php echo
$contactperson2->get_name();?>
+ <?php }?>
</dd>
<dt><label
for="contact1_phone">Telefon</label></dt>
<dd>
+ <?php if($editable){?>
<input type="text"
name="contact2_phone" value="<?php echo $contactperson2->get_phone();?>"/>
+ <?php }else{?>
+ <?php echo
$contactperson2->get_phone();?>
+ <?php }?>
</dd>
<dt><label
for="contact1_mail">E-post</label></dt>
<dd>
+ <?php if($editable){?>
<input type="text"
name="contact2_email" value="<?php echo $contactperson2->get_email();?>"/>
+ <?php }else{?>
+ <?php echo
$contactperson2->get_email();?>
+ <?php }?>
</dd>
<?php }?>
</dl>
Modified: branches/Version-1_0-branch/controller/templates/base/component.xsl
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/component.xsl
2012-06-05 07:50:44 UTC (rev 9506)
+++ branches/Version-1_0-branch/controller/templates/base/component.xsl
2012-06-05 08:03:34 UTC (rev 9507)
@@ -72,7 +72,7 @@
<xsl:choose>
<xsl:when test="type = 'date-picker'">
- <td valign="top">
+ <td>
<div class="date-picker">
<input id="filter_{name}"
name="filter_{name}" type="text">
<xsl:attribute
name="value"><xsl:value-of select="../../../filters/*[local-name() =
$filter_key]"/></xsl:attribute>
@@ -81,8 +81,8 @@
</td>
</xsl:when>
<xsl:when test="type = 'autocomplete'">
- <td valign="top" width="160px">
- <div style="width:140px">
+ <td>
+ <div>
<input
id="filter_{name}_name" name="filter_{name}_name" type="text">
<xsl:attribute
name="value"><xsl:value-of select="../../../filters/*[local-name() =
$filter_key_name]"/></xsl:attribute>
</input>
@@ -147,7 +147,7 @@
</td>
</xsl:when>
<xsl:when test="type = 'filter'">
- <td valign="top">
+ <td>
<xsl:variable name="name"><xsl:value-of
select="name"/></xsl:variable>
<select id="{$name}" name="{$name}"
onMouseout="window.status='';return true;">
@@ -183,12 +183,12 @@
</xsl:for-each>
</tr>
<xsl:if test="item/text and normalize-space(item/text)">
- <thead style="background:none">
+ <thead>
<tr>
<xsl:for-each select="item">
<td>
<xsl:if
test="name">
- <label
style='margin:auto 0.25em'>
+ <label>
<xsl:attribute name="for"><xsl:value-of select="phpgw:conditional(not(name),
'', name)"/></xsl:attribute>
<xsl:value-of select="phpgw:conditional(not(text), '', text)"/>
</label>
@@ -236,85 +236,4 @@
</script>
-</xsl:template>
-<!--
-<xsl:template match="lists">
-
-<div style="background: none repeat scroll 0 0 #EDF5FF;border: 1px solid
#243356;margin: 20px;padding: 20px;">
--->
- <!-- When control area is chosen an ajax request is executed.
The operation fetches controls from db and populates the control list below.
- The ajax opearation is handled in file ajax.js
- -->
- <!--
- <select id="control_area_list" name="control_area_list">
- <xsl:for-each select="control_area_list">
- <xsl:variable
name="control_area_id"><xsl:value-of select="id"/></xsl:variable>
- <option value="{$control_area_id}">
- <xsl:value-of select="title"/>
- </option>
- </xsl:for-each>
- </select>
-
- <select id="control_list" name="control_list">
- <xsl:for-each select="control_list">
- <xsl:variable name="control_id"><xsl:value-of
select="id"/></xsl:variable>
- <option value="{$control_id}">
- <xsl:value-of select="title"/>
- </option>
-
- </xsl:for-each>
- </select>
- </div>
-
- <div style="background: none repeat scroll 0 0 #EDF5FF;border: 1px
solid #243356;margin: 20px;padding: 20px;">
- <select id="building_types" name="building_types">
- <xsl:for-each select="building_types">
- <xsl:variable
name="building_type_id"><xsl:value-of select="id"/></xsl:variable>
- <option value="{$building_type_id}">
- <xsl:value-of select="name"/>
- </option>
-
- </xsl:for-each>
- </select>
-
- <select id="category_types" name="category_types">
- <xsl:for-each select="category_types">
- <xsl:variable
name="category_type_id"><xsl:value-of select="id"/></xsl:variable>
- <option value="{$category_type_id}">
- <xsl:value-of select="name"/>
- </option>
-
- </xsl:for-each>
- </select>
-
- <select id="district_list" name="district_list">
- <xsl:for-each select="district_list">
- <xsl:variable
name="district_list_id"><xsl:value-of select="id"/></xsl:variable>
- <option value="{$district_list_id}">
- <xsl:value-of select="name"/>
- </option>
-
- </xsl:for-each>
- </select>
-
- <select id="part_of_town_list" name="part_of_town_list">
- <xsl:for-each select="part_of_town_list">
- <xsl:variable
name="part_of_town_list_id"><xsl:value-of select="id"/></xsl:variable>
- <option value="{$part_of_town_list_id}">
- <xsl:value-of select="name"/>
- </option>
-
- </xsl:for-each>
- </select>
- <select id="responsibility_roles" name="responsibility_roles">
- <xsl:for-each select="responsibility_roles_list">
- <xsl:variable
name="responsibility_roles_list_id"><xsl:value-of select="id"/></xsl:variable>
- <option value="{$responsibility_roles_list_id}">
- <xsl:value-of select="name"/>
- </option>
-
- </xsl:for-each>
- </select>
- </div>
-</xsl:template>
--->
+</xsl:template>
\ No newline at end of file
Modified: branches/Version-1_0-branch/controller/templates/base/css/base.css
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/css/base.css
2012-06-05 07:50:44 UTC (rev 9506)
+++ branches/Version-1_0-branch/controller/templates/base/css/base.css
2012-06-05 08:03:34 UTC (rev 9507)
@@ -1889,4 +1889,48 @@
#details table td{
text-align: left;
padding-right: 10px;
-}
\ No newline at end of file
+}
+
+#procedures h2, #procedures h4{
+ margin:5px 0;
+}
+
+#procedures .desc {
+ margin-left:10px;
+}
+
+#procedures h3 {
+ margin:15px 0 3px 0;
+}
+
+#procedures h4 .doc{
+ margin-left:10px;
+}
+
+#procedures #groups .group{
+ margin-left:10px;
+}
+
+#procedures #groups .group{
+ margin-left:10px;
+}
+
+#procedures #groups .group{
+ margin-bottom:10px;
+}
+
+#procedures .btn_sm {
+ margin-left:5px;
+}
+
+.yui-skin-sam td.auto{
+ width: 160px;
+}
+
+.yui-skin-sam div.auto{
+ width: 140px;
+}
+
+. yui-skin-sam thead{
+ background: none;
+}
Modified: branches/Version-1_0-branch/controller/templates/base/datatable.xsl
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/datatable.xsl
2012-06-05 07:50:44 UTC (rev 9506)
+++ branches/Version-1_0-branch/controller/templates/base/datatable.xsl
2012-06-05 08:03:34 UTC (rev 9507)
@@ -17,7 +17,7 @@
</func:function>
<xsl:template match="data">
- <iframe id="yui-history-iframe"
src="phpgwapi/js/yahoo/history/assets/blank.html"
style="position:absolute;top:0; left:0;width:1px;
height:1px;visibility:hidden;"></iframe>
+ <iframe id="yui-history-iframe"
src="phpgwapi/js/yahoo/history/assets/blank.html"></iframe>
<input id="yui-history-field" type="hidden"/>
<xsl:call-template name="yui_booking_i18n"/>
<xsl:apply-templates select="form" />
@@ -31,7 +31,7 @@
<xsl:template match="toolbar">
<div id="toolbar">
- <table class='yui-skin-sam' border="0" cellspacing="0"
cellpadding="0" style="padding:0px; margin:0px;">
+ <table class='yui-skin-sam'>
<tr>
<xsl:for-each select="item">
<xsl:variable name="filter_key"
select="concat('filter_', name)"/>
@@ -49,8 +49,8 @@
</td>
</xsl:when>
<xsl:when test="type = 'autocomplete'">
- <td valign="top" width="160px">
- <div style="width:140px">
+ <td class="auto">
+ <div class="auto">
<input
id="filter_{name}_name" name="filter_{name}_name" type="text">
<xsl:attribute
name="value"><xsl:value-of select="../../../filters/*[local-name() =
$filter_key_name]"/></xsl:attribute>
</input>
@@ -134,36 +134,6 @@
</xsl:for-each>
</select>
</td>
-<!--
- <xsl:if test="onChangeSelect">
- <script type="text/javascript">
-
YAHOO.util.Event.onDOMReady(function() {
- var elementid =
"<xsl:value-of select="name"/>";
- <![CDATA[
- var oElement =
document.getElementById(elementid);
- function
onChangeSelectCallback(e, oElement)
- {
-
YAHOO.portico.dataSourceUrl;
-
- var
myselect=document.getElementById(elementid);
- for
(var i=0; i<myselect.options.length; i++)
- {
-
if (myselect.options[i].selected==true)
-
{
-
break;
-
}
- }
-
- strURL
= YAHOO.portico.dataSourceUrl + '&' + elementid + '=' +
myselect.options[i].value;
-
alert('datatable.xsl::' + strURL);
-
//alert("onChangeSelectCallback::Do something");
- }
-
YAHOO.util.Event.addListener(oElement, "change", onChangeSelectCallback);
- ]]>
- });
- </script>
- </xsl:if>
--->
</xsl:when>
<xsl:otherwise>
<td valign="top">
@@ -181,12 +151,12 @@
</xsl:for-each>
</tr>
<xsl:if test="item/text and normalize-space(item/text)">
- <thead style="background:none">
+ <thead>
<tr>
<xsl:for-each select="item">
<td>
<xsl:if
test="name">
- <label
style='margin:auto 0.25em'>
+ <label>
<xsl:attribute name="for"><xsl:value-of select="phpgw:conditional(not(name),
'', name)"/></xsl:attribute>
<xsl:value-of select="phpgw:conditional(not(text), '', text)"/>
</label>
Modified:
branches/Version-1_0-branch/controller/templates/base/procedure/view_procedures_for_control.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/procedure/view_procedures_for_control.xsl
2012-06-05 07:50:44 UTC (rev 9506)
+++
branches/Version-1_0-branch/controller/templates/base/procedure/view_procedures_for_control.xsl
2012-06-05 08:03:34 UTC (rev 9507)
@@ -1,9 +1,11 @@
<!-- $Id: procedure_item.xsl 8485 2012-01-05 08:21:03Z erikhl $ -->
<xsl:template match="data">
- <h3 style="margin:5px 0;">Prosedyre for <xsl:value-of
select="control_procedure/title"/></h3>
- <div>
+<div id="procedures">
+ <h2>Prosedyre for <xsl:value-of select="control_procedure/title"/></h2>
+
+
<a class="btn_m" id="print-control-items" target="_blank">
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uiprocedure.print_procedure</xsl:text>
@@ -17,27 +19,27 @@
</xsl:attribute>
Skriv ut prosedyre
</a>
- </div>
+
<xsl:if test="control_procedure/documents/child::node()">
- <h4 style="margin:5px 0;">Dokumenter</h4>
+ <h4>Dokumenter</h4>
<xsl:for-each select="control_procedure/documents">
- <div style="margin-left:10px;">
+ <div class="doc">
<xsl:variable name="doc_link"><xsl:value-of
select='document_link'/></xsl:variable>
<span><a href="{$doc_link}"><xsl:value-of
select="title"/></a></span>
- <span style="margin-left:10px;"><xsl:value-of
select="description" disable-output-escaping="yes"/></span>
+ <span class="desc"><xsl:value-of
select="description" disable-output-escaping="yes"/></span>
</div>
</xsl:for-each>
</xsl:if>
- <h3 style="margin:15px 0 3px 0;">Prosedyrer for grupper</h3>
+ <h3>Prosedyrer for grupper</h3>
<ul id="groups">
<xsl:for-each select="group_procedures_array">
<li>
<h4><xsl:value-of
select="procedure/title"/></h4>
- <div style="margin-bottom:10px;">
+ <div class="group">
<span>Gruppe: </span><xsl:value-of
select="control_group/group_name"/>
- <a class="btn_sm"
style="margin-left:5px;" id="print-control-items" target="_blank">
+ <a class="btn_sm"
id="print-control-items" target="_blank">
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uiprocedure.print_procedure</xsl:text>
<xsl:text>&procedure_id=</xsl:text>
@@ -54,16 +56,17 @@
</a>
</div>
<xsl:if test="documents/child::node()">
- <h4 style="margin:5px 0;">Dokumenter</h4>
+ <h4>Dokumenter</h4>
<xsl:for-each select="documents">
- <div style="margin-left:10px;">
+ <div class="doc">
<xsl:variable
name="doc_link"><xsl:value-of select='document_link'/></xsl:variable>
<span><a
href="{$doc_link}"><xsl:value-of select="title"/></a></span>
- <span
style="margin-left:10px;"><xsl:value-of select="description"
disable-output-escaping="yes"/></span>
+ <span
class="desc"><xsl:value-of select="description"
disable-output-escaping="yes"/></span>
</div>
</xsl:for-each>
</xsl:if>
</li>
</xsl:for-each>
</ul>
+</div>
</xsl:template>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9507] Merge 9503:9506 from trunk,
Sigurd Nes <=