[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9339] Merge 9325:9338 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9339] Merge 9325:9338 from trunk |
|
Date: |
Wed, 09 May 2012 12:41:33 +0000 |
Revision: 9339
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9339
Author: sigurdne
Date: 2012-05-09 12:41:33 +0000 (Wed, 09 May 2012)
Log Message:
-----------
Merge 9325:9338 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
branches/Version-1_0-branch/activitycalendar/inc/class.socontactperson.inc.php
branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
branches/Version-1_0-branch/activitycalendar/inc/model/class.activity.inc.php
branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang
branches/Version-1_0-branch/activitycalendar/templates/base/activity.php
branches/Version-1_0-branch/activitycalendarfrontend/inc/class.menu.inc.php
branches/Version-1_0-branch/activitycalendarfrontend/inc/class.uiactivity.inc.php
branches/Version-1_0-branch/activitycalendarfrontend/index.php
branches/Version-1_0-branch/activitycalendarfrontend/setup/phpgw_no.lang
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity.php
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_edit.php
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_edit_step_1.php
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_new.php
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_new_step_1.php
branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
branches/Version-1_0-branch/controller/inc/class.uicase.inc.php
branches/Version-1_0-branch/controller/inc/component/class.month_calendar.inc.php
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month.xsl
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year.xsl
branches/Version-1_0-branch/controller/templates/base/case/view_case_message.xsl
branches/Version-1_0-branch/controller/templates/base/css/base.css
branches/Version-1_0-branch/property/inc/class.sotts.inc.php
branches/Version-1_0-branch/property/setup/tables_current.inc.php
branches/Version-1_0-branch/property/setup/tables_update.inc.php
Added Paths:
-----------
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_new_org.php
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/config.tpl
branches/Version-1_0-branch/phpgwapi/templates/activitycalendar/
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
+
/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
Modified:
branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
2012-05-09 12:39:39 UTC (rev 9338)
+++ branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
2012-05-09 12:41:33 UTC (rev 9339)
@@ -471,12 +471,12 @@
{
if($activity->get_new_org())
{
- $contacts =
activitycalendar_soorganization::get_instance()->get_contacts($activity->get_organization_id());
+ $contacts =
activitycalendar_soorganization::get_instance()->get_contacts_local($activity->get_organization_id());
$activity->set_contact_persons($contacts);
}
else
{
- $contacts =
activitycalendar_soorganization::get_instance()->get_contacts_local($activity->get_organization_id());
+ $contacts =
activitycalendar_soorganization::get_instance()->get_contacts($activity->get_organization_id());
$activity->set_contact_persons($contacts);
}
}
@@ -719,7 +719,7 @@
$whereclause_date = "AND last_change_date >
{$from_date}";
}
$activities = array();
- $sql = "SELECT * FROM activity_activity where state=3
{$whereclause_date}";
+ $sql = "SELECT * FROM activity_activity where state in(3,5)
{$whereclause_date}";
$this->db->query($sql, __LINE__, __FILE__);
while ($this->db->next_record())
{
@@ -949,6 +949,7 @@
$targets[] = array(
'id' =>
(int) $this->db->f('id'),
'name' =>
utf8_decode($this->db->f('name',true)),
+ 'sort' =>
(int) $this->db->f('sort'),
);
}
return $targets;
Modified:
branches/Version-1_0-branch/activitycalendar/inc/class.socontactperson.inc.php
===================================================================
---
branches/Version-1_0-branch/activitycalendar/inc/class.socontactperson.inc.php
2012-05-09 12:39:39 UTC (rev 9338)
+++
branches/Version-1_0-branch/activitycalendar/inc/class.socontactperson.inc.php
2012-05-09 12:41:33 UTC (rev 9339)
@@ -195,7 +195,7 @@
function get_group_contact_name($id)
{
$result = "Ingen";
- if(isset($id)){
+ if(isset($id) && $id != ''){
$q1="SELECT name, phone, email FROM bb_group_contact WHERE
id={$id}";
$this->db->query($q1, __LINE__, __FILE__);
while($this->db->next_record()){
@@ -208,7 +208,7 @@
function get_group_contact_name_local($id)
{
$result = "Ingen";
- if(isset($id)){
+ if(isset($id) && $id != ''){
$q1="SELECT name, phone, email FROM activity_contact_person
WHERE id={$id}";
$this->db->query($q1, __LINE__, __FILE__);
while($this->db->next_record()){
@@ -221,7 +221,7 @@
function get_org_contact_name($id)
{
$result = "Ingen";
- if(isset($id)){
+ if(isset($id) && $id != ''){
$q1="SELECT name, phone, email FROM bb_organization_contact
WHERE id={$id}";
$this->db->query($q1, __LINE__, __FILE__);
while($this->db->next_record()){
@@ -234,7 +234,7 @@
function get_org_contact_name_local($id)
{
$result = "Ingen";
- if(isset($id)){
+ if(isset($id) && $id != ''){
$q1="SELECT name, phone, email FROM activity_contact_person
WHERE id={$id}";
$this->db->query($q1, __LINE__, __FILE__);
while($this->db->next_record()){
Modified:
branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
2012-05-09 12:39:39 UTC (rev 9338)
+++ branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
2012-05-09 12:41:33 UTC (rev 9339)
@@ -265,6 +265,12 @@
}
}
}
+ $editable = true;
+ if($activity->get_new_org())
+ {
+ $error = lang('org_not_transferred');
+ $editable = false;
+ }
return $this->render('activity.php', array
(
@@ -278,7 +284,7 @@
'targets' => $targets,
'districts' => $districts,
'offices' => $offices,
- 'editable' => true,
+ 'editable' => $editable,
'cancel_link' => $cancel_link,
'message' => isset($message) ? $message :
phpgw::get_var('message'),
'error' => isset($error) ? $error :
phpgw::get_var('error')
Modified:
branches/Version-1_0-branch/activitycalendar/inc/model/class.activity.inc.php
===================================================================
---
branches/Version-1_0-branch/activitycalendar/inc/model/class.activity.inc.php
2012-05-09 12:39:39 UTC (rev 9338)
+++
branches/Version-1_0-branch/activitycalendar/inc/model/class.activity.inc.php
2012-05-09 12:41:33 UTC (rev 9339)
@@ -251,8 +251,9 @@
if($this->get_new_org())
{
$group_name =
activitycalendar_sogroup::get_instance()->get_group_name_local($this->get_group_id());
- $contact_1 =
activitycalendar_socontactperson::get_instance()->get_group_contact_name_local($this->get_contact_person_1());
- $contact_2 =
activitycalendar_socontactperson::get_instance()->get_group_contact_name_local($this->get_contact_person_2());
+
$this->set_contact_persons(activitycalendar_socontactperson::get_instance()->get_local_contact_persons($this->get_group_id(),
true));
+ $contact_1 =
activitycalendar_socontactperson::get_instance()->get_group_contact_name_local($this->get_contact_person_1()->get_id());
+ $contact_2 =
activitycalendar_socontactperson::get_instance()->get_group_contact_name_local($this->get_contact_person_2()->get_id());
$desc =
activitycalendar_sogroup::get_instance()->get_description_local($this->get_group_id());
}
else
@@ -270,8 +271,9 @@
if($this->get_new_org())
{
$org_name =
activitycalendar_soorganization::get_instance()->get_organization_name_local($this->get_organization_id());
- $contact_1 =
activitycalendar_socontactperson::get_instance()->get_org_contact_name_local($this->get_contact_person_1());
- $contact_2 =
activitycalendar_socontactperson::get_instance()->get_org_contact_name_local($this->get_contact_person_2());
+
$this->set_contact_persons(activitycalendar_socontactperson::get_instance()->get_local_contact_persons($this->get_organization_id()));
+ $contact_1 =
activitycalendar_socontactperson::get_instance()->get_org_contact_name_local($this->get_contact_person_1()->get_id());
+ $contact_2 =
activitycalendar_socontactperson::get_instance()->get_org_contact_name_local($this->get_contact_person_2()->get_id());
$desc =
activitycalendar_soorganization::get_instance()->get_description_local($this->get_organization_id());
}
else
Modified: branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang
2012-05-09 12:39:39 UTC (rev 9338)
+++ branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang
2012-05-09 12:41:33 UTC (rev 9339)
@@ -433,4 +433,5 @@
edit_contact_info activitycalendar no For å redigere
kontaktopplysninger:
edit_contact_info_org activitycalendar no Gå til
organisasjonsopplysninger
edit_contact_info_group activitycalendar no Gå til
gruppeopplysninger
-arena_helptext activitycalendar no I feltet Navn skal det stå navn
på arena, som det heter på folkemunne.<br/>Når du redigerer feltet
besøksadresse, gjøres det automatisk oppslag i gatetabellen, dette for å sikre
at adresser skrives riktig, og kan kobles mot kart.<br/>Når du har funnet rett
gateadresse , gå til feltet Husnummer og legg inn husnummer.<br/>Trykk lagre.
\ No newline at end of file
+arena_helptext activitycalendar no I feltet Navn skal det stå navn
på arena, som det heter på folkemunne.<br/>Når du redigerer feltet
besøksadresse, gjøres det automatisk oppslag i gatetabellen, dette for å sikre
at adresser skrives riktig, og kan kobles mot kart.<br/>Når du har funnet rett
gateadresse , gå til feltet Husnummer og legg inn husnummer.<br/>Trykk lagre.
+org_not_transferred activitycalendar no Organisasjonen/gruppen
som aktiviteten er tilknyttet er ikke overført til
organisasjonsregisteret.<br/>Før aktiviteten kan redigeres, må denne overføres.
\ No newline at end of file
Modified:
branches/Version-1_0-branch/activitycalendar/templates/base/activity.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/templates/base/activity.php
2012-05-09 12:39:39 UTC (rev 9338)
+++ branches/Version-1_0-branch/activitycalendar/templates/base/activity.php
2012-05-09 12:41:33 UTC (rev 9339)
@@ -443,7 +443,14 @@
else
{
if($activity->get_organization_id()){
- echo
activitycalendar_soorganization::get_instance()->get_organization_name($activity->get_organization_id());
+
if($activity->get_new_org())
+ {
+ echo
activitycalendar_soorganization::get_instance()->get_organization_name_local($activity->get_organization_id());
+ }
+ else
+ {
+ echo
activitycalendar_soorganization::get_instance()->get_organization_name($activity->get_organization_id());
+ }
}
}
?>
@@ -496,7 +503,10 @@
}
else
if($activity->get_organization_id())
{
- echo
$contpers_so->get_org_contact_name($activity->get_contact_person_1());
+
if($activity->get_new_org())
+ echo
$contpers_so->get_org_contact_name_local($activity->get_contact_person_1());
+ else
+ echo
$contpers_so->get_org_contact_name($activity->get_contact_person_1());
}
?>
</dd>
@@ -513,7 +523,10 @@
}
else
if($activity->get_organization_id())
{
- echo
$contpers_so->get_org_contact_name($activity->get_contact_person_2());
+
if($activity->get_new_org())
+ echo
$contpers_so->get_org_contact_name_local($activity->get_contact_person_2());
+ else
+ echo
$contpers_so->get_org_contact_name($activity->get_contact_person_2());
}
?>
</dd>
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/inc/class.menu.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendarfrontend/inc/class.menu.inc.php
2012-05-09 12:39:39 UTC (rev 9338)
+++ branches/Version-1_0-branch/activitycalendarfrontend/inc/class.menu.inc.php
2012-05-09 12:41:33 UTC (rev 9339)
@@ -16,7 +16,7 @@
'index' => array
(
'text' =>
lang('Configuration'),
- 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'admin.uiconfig.index', 'appname' => 'activiticalendarfrontend') )
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'admin.uiconfig.index', 'appname' => 'activitycalendarfrontend') )
),
);
}
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/inc/class.uiactivity.inc.php
===================================================================
---
branches/Version-1_0-branch/activitycalendarfrontend/inc/class.uiactivity.inc.php
2012-05-09 12:39:39 UTC (rev 9338)
+++
branches/Version-1_0-branch/activitycalendarfrontend/inc/class.uiactivity.inc.php
2012-05-09 12:41:33 UTC (rev 9339)
@@ -48,6 +48,12 @@
{
//$GLOBALS['phpgw']->redirect_link('/activitycalendarfrontend/index.php',
array('menuaction' => 'activitycalendarfrontend.uiactivity.edit', 'action' =>
'new_activity'));
$GLOBALS['phpgw']->js->validate_file( 'json', 'json',
'phpgwapi' );
+
+ $c =
createobject('phpgwapi.config','activitycalendarfrontend');
+ $c->read();
+ $config = $c->config_data;
+
+ $ajaxUrl = $c->config_data['AJAXURL'];
$categories = $this->so_activity->get_categories();
$targets = $this->so_activity->get_targets();
@@ -67,7 +73,7 @@
if($o_id == "new_org")
{
$new_org = true;
- $this->render('activity_new.php', array
+ $this->render('activity_new_org.php',
array
(
'activity' =>
$activity,
'new_organization' =>
true,
@@ -79,7 +85,8 @@
'offices' => $offices,
'editable' => true,
'message' =>
isset($message) ? $message : phpgw::get_var('message'),
- 'error' =>
isset($error) ? $error : phpgw::get_var('error')
+ 'error' =>
isset($error) ? $error : phpgw::get_var('error'),
+ 'ajaxURL' => $ajaxUrl
)
);
}
@@ -116,11 +123,96 @@
'offices' => $offices,
'editable' => true,
'message' =>
isset($message) ? $message : phpgw::get_var('message'),
- 'error' =>
isset($error) ? $error : phpgw::get_var('error')
+ 'error' =>
isset($error) ? $error : phpgw::get_var('error'),
+ 'ajaxURL' => $ajaxUrl
)
);
}
}
+ else if(isset($_POST['save_organization']))
+ {
+ //add new organization to internal
activitycalendar organization register
+ $org_info['name'] = phpgw::get_var('orgname');
+ $org_info['orgnr'] = phpgw::get_var('orgno');
+ $org_info['homepage'] =
phpgw::get_var('homepage');
+ $org_info['phone'] = phpgw::get_var('phone');
+ $org_info['email'] = phpgw::get_var('email');
+ $org_info['description'] =
phpgw::get_var('org_description');
+ $org_info['street'] = phpgw::get_var('address')
. ' ' . phpgw::get_var('number') . ', ' . phpgw::get_var('postaddress');
+ //$org_info['zip'] =
phpgw::get_var('postaddress');
+ $org_info['district'] =
phpgw::get_var('org_district');
+ $org_info['status'] = "new";
+ $o_id =
$this->so_activity->add_organization_local($org_info);
+
+ //add contact persons
+ $contact1 = array();
+ $contact1['name'] =
phpgw::get_var('org_contact1_name');
+ $contact1['phone'] =
phpgw::get_var('org_contact1_phone');
+ $contact1['mail'] =
phpgw::get_var('org_contact1_mail');
+ $contact1['org_id'] = $o_id;
+ $contact1['group_id'] = 0;
+
$this->so_activity->add_contact_person_local($contact1);
+
+ if(phpgw::get_var('org_contact2_name'))
+ {
+ $contact2 = array();
+ $contact2['name'] =
phpgw::get_var('org_contact2_name');
+ $contact2['phone'] =
phpgw::get_var('org_contact2_phone');
+ $contact2['mail'] =
phpgw::get_var('org_contact2_mail');
+ $contact2['org_id'] = $o_id;
+ $contact2['group_id'] = 0;
+
$this->so_activity->add_contact_person_local($contact2);
+ }
+ else
+ {
+
$this->so_activity->add_contact_person_local($contact1);
+ }
+
+ //$persons =
$this->so_organization->get_contacts_local_as_objects($o_id);
+ //var_dump($persons);
+ $person_arr =
$this->so_contact->get_local_contact_persons($o_id);
+ foreach($person_arr as $p)
+ {
+ //var_dump($p);
+ $persons[] = $p;
+ }
+
+ $person_ids =
$this->so_organization->get_contacts_local($o_id);
+ $desc = phpgw::get_var('org_description');
+ $organization =
$this->so_organization->get_organization_local($o_id);
+ $new_org = true;
+
+ $organization =
$this->so_organization->get_organization_local($o_id);
+ $person_arr =
$this->so_organization->get_contacts_local_as_objects($o_id);
+ foreach($person_arr as $p)
+ {
+ //var_dump($p);
+ $persons[] = $p;
+ }
+
+ $message = lang('organization_saved_form');
+
+ $this->render('activity_new.php', array
+ (
+ 'activity' => $activity,
+ 'new_organization' => true,
+ 'organization' => $organization,
+ 'contact1' => $persons[0],
+ 'contact2' => $persons[1],
+ 'groups' => $groups,
+ 'arenas' => $arenas,
+ 'buildings' => $buildings,
+ 'categories' => $categories,
+ 'targets' => $targets,
+ 'districts' => $districts,
+ 'offices' => $offices,
+ 'editable' => true,
+ 'message' => isset($message) ?
$message : phpgw::get_var('message'),
+ 'error' => isset($error) ?
$error : phpgw::get_var('error'),
+ 'ajaxURL' => $ajaxUrl
+ )
+ );
+ }
else if(isset($_POST['save_activity']))
{
//$persons =
$this->so_organization->get_contacts($o_id);
@@ -134,41 +226,9 @@
$get_org_from_local = true;
}
- if($o_id == "new_org")
+ if($get_org_from_local)
{
$activity->set_new_org(true);
- //add new organization to internal
activitycalendar organization register
- $org_info['name'] =
phpgw::get_var('orgname');
- $org_info['orgnr'] =
phpgw::get_var('orgno');
- $org_info['homepage'] =
phpgw::get_var('homepage');
- $org_info['phone'] =
phpgw::get_var('phone');
- $org_info['email'] =
phpgw::get_var('email');
- $org_info['description'] =
phpgw::get_var('org_description');
- $org_info['street'] =
phpgw::get_var('address') . ' ' . phpgw::get_var('number') . ', ' .
phpgw::get_var('postaddress');
- //$org_info['zip'] =
phpgw::get_var('postaddress');
- $org_info['district'] =
phpgw::get_var('org_district');
- $org_info['status'] = "new";
- $o_id =
$this->so_activity->add_organization_local($org_info);
-
- //add contact persons
- $contact1 = array();
- $contact1['name'] =
phpgw::get_var('org_contact1_name');
- $contact1['phone'] =
phpgw::get_var('org_contact1_phone');
- $contact1['mail'] =
phpgw::get_var('org_contact1_mail');
- $contact1['org_id'] = $o_id;
- $contact1['group_id'] = 0;
-
$this->so_activity->add_contact_person_local($contact1);
-
- $contact2 = array();
- $contact2['name'] =
phpgw::get_var('org_contact2_name');
- $contact2['phone'] =
phpgw::get_var('org_contact2_phone');
- $contact2['mail'] =
phpgw::get_var('org_contact2_mail');
- $contact2['org_id'] = $o_id;
- $contact2['group_id'] = 0;
-
$this->so_activity->add_contact_person_local($contact2);
-
- //$persons =
$this->so_organization->get_contacts_local_as_objects($o_id);
- //var_dump($persons);
$person_arr =
$this->so_contact->get_local_contact_persons($o_id);
foreach($person_arr as $p)
{
@@ -176,7 +236,7 @@
$persons[] = $p;
}
$person_ids =
$this->so_organization->get_contacts_local($o_id);
- $desc =
phpgw::get_var('org_description');
+ $desc =
$this->so_organization->get_description_local($o_id);
$organization =
$this->so_organization->get_organization_local($o_id);
$new_org = true;
$new_org_group = true;
@@ -303,6 +363,8 @@
$activity->set_time(phpgw::get_var('time'));
$activity->set_contact_persons($person_ids);
$activity->set_special_adaptation(phpgw::get_var('special_adaptation'));
+
$activity->set_contact_person_2_address(phpgw::get_var('contact2_address') . ",
" . phpgw::get_var('contact2_number'));
+
$activity->set_contact_person_2_zip(phpgw::get_var('contact2_postaddress'));
$activity->set_frontend(true);
$activity->set_new_org($new_org_group);
@@ -345,7 +407,8 @@
'districts' => $districts,
'offices' => $offices,
'message' => isset($message) ? $message : phpgw::get_var('message'),
- 'error'
=> isset($error) ? $error : phpgw::get_var('error')
+ 'error'
=> isset($error) ? $error : phpgw::get_var('error'),
+
'ajaxURL' => $ajaxUrl
)
);
}
@@ -378,7 +441,8 @@
'editable' => true,
'cancel_link' =>
$cancel_link,
'message' =>
isset($message) ? $message : phpgw::get_var('message'),
- 'error' =>
isset($error) ? $error : phpgw::get_var('error')
+ 'error' =>
isset($error) ? $error : phpgw::get_var('error'),
+ 'ajaxURL' => $ajaxUrl
)
);
}
@@ -387,7 +451,8 @@
{
return $this->render('activity_new_step_1.php',
array
(
- 'organizations' =>
$organizations
+ 'organizations' =>
$organizations,
+ 'ajaxURL' => $ajaxUrl
)
);
}
@@ -420,6 +485,12 @@
{
$GLOBALS['phpgw']->js->validate_file( 'json', 'json',
'phpgwapi' );
+ $c =
createobject('phpgwapi.config','activitycalendarfrontend');
+ $c->read();
+ $config = $c->config_data;
+
+ $ajaxUrl = $c->config_data['AJAXURL'];
+
$id = intval(phpgw::get_var('id', 'GET'));
$categories = $this->so_activity->get_categories();
@@ -445,7 +516,8 @@
return
$this->render('activity_edit_step_1.php', array
(
'activities' =>
$activities,
- 'message' => $message
+ 'message' => $message,
+ 'ajaxURL' => $ajaxUrl
)
);
}
@@ -461,7 +533,8 @@
return
$this->render('activity_edit_step_1.php', array
(
'activities' =>
$activities,
- 'organizations' =>
$organizations
+ 'organizations' =>
$organizations,
+ 'ajaxURL' => $ajaxUrl
)
);
}
@@ -470,7 +543,8 @@
$activities =
$this->so_activity->get(null, null, 'title', true, null, null,
array('activity_state' => 3));
return
$this->render('activity_edit_step_1.php', array
(
- 'activities' =>
$activities
+ 'activities' =>
$activities,
+ 'ajaxURL' => $ajaxUrl
)
);
}
@@ -486,7 +560,8 @@
$activities =
$this->so_activity->get(null, null, 'title', true, null, null,
array('activity_state' => 3));
return
$this->render('activity_edit_step_1.php', array
(
- 'activities' =>
$activities
+ 'activities' =>
$activities,
+ 'ajaxURL' =>
$ajaxUrl
)
);
}
@@ -497,7 +572,8 @@
$activities =
$this->so_activity->get(null, null, 'title', true, null, null,
array('activity_state' => 3));
return
$this->render('activity_edit_step_1.php', array
(
- 'activities' =>
$activities
+ 'activities' =>
$activities,
+ 'ajaxURL' =>
$ajaxUrl
)
);
}
@@ -589,7 +665,8 @@
'districts' => $districts,
'offices' => $offices,
'message' => isset($message) ? $message :
phpgw::get_var('message'),
-
'error' => isset($error) ? $error : phpgw::get_var('error')
+
'error' => isset($error) ? $error : phpgw::get_var('error'),
+
'ajaxURL' => $ajaxUrl
)
);
}
@@ -618,7 +695,8 @@
'editable' => true,
'cancel_link' => $cancel_link,
'message' => isset($message) ? $message : phpgw::get_var('message'),
-
'error' => isset($error) ? $error : phpgw::get_var('error')
+
'error' => isset($error) ? $error : phpgw::get_var('error'),
+
'ajaxURL' => $ajaxUrl
)
);
}
@@ -641,7 +719,8 @@
'offices' => $offices,
'editable' => true,
'message' => isset($message) ? $message : phpgw::get_var('message'),
-
'error' => isset($error) ? $error : phpgw::get_var('error')
+
'error' => isset($error) ? $error : phpgw::get_var('error'),
+
'ajaxURL' => $ajaxUrl
)
);
}
Modified: branches/Version-1_0-branch/activitycalendarfrontend/index.php
===================================================================
--- branches/Version-1_0-branch/activitycalendarfrontend/index.php
2012-05-09 12:39:39 UTC (rev 9338)
+++ branches/Version-1_0-branch/activitycalendarfrontend/index.php
2012-05-09 12:41:33 UTC (rev 9339)
@@ -12,10 +12,19 @@
// Make sure we're always logged in
if (!phpgw::get_var(session_name()) ||
!$GLOBALS['phpgw']->session->verify())
{
- $login = "bookingguest";
- $passwd = "bkbooking";
+
+ $c = createobject('phpgwapi.config','activitycalendarfrontend');
+ $c->read();
+ $config = $c->config_data;
+
+ $login = $c->config_data['anonymous_user'];
+ $passwd = $c->config_data['anonymous_pass'];
$_POST['submitit'] = "";
-
+
+/* $login = "activitycalendar_guest";
+ $passwd = "bkactivities";
+ $_POST['submitit'] = "";
+*/
$GLOBALS['sessionid'] =
$GLOBALS['phpgw']->session->create($login, $passwd);
if(!$GLOBALS['sessionid'])
{
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/activitycalendarfrontend/setup/phpgw_no.lang
2012-05-09 12:39:39 UTC (rev 9338)
+++ branches/Version-1_0-branch/activitycalendarfrontend/setup/phpgw_no.lang
2012-05-09 12:41:33 UTC (rev 9339)
@@ -94,4 +94,7 @@
address activitycalendarfrontend no Adresse
activity_edit_helptext_step1 activitycalendarfrontend no Skal du
endre opplysninger knyttet til en aktivitet må du være registrert som
kontaktperson for organisasjonen.<br/>Du velger organisasjon og aktivitet i
bildet under, og får en e-post i retur med en lenke til endringsskjema.
mail_body_update_frontend activitycalendarfrontend no Dette
er en melding fra Bergen kommune/AktivBy.<br/><br/>I aktivitetsoversikten som
ligger i kommuneportalen på internett, står du registrert som kontaktperson for
%1.<br/>Det har kommet inn et endringsønske på denne aktiviteten. Bruk lenken
under for å endre opplysningene om aktiviteten.<br/>%2<br/><br/><br/> Mvh %3
kulturkontor
-mail_subject_update activitycalendarfrontend no Melding fra
AktivBy - Aktivitetsoversikt
\ No newline at end of file
+mail_subject_update activitycalendarfrontend no Melding fra
AktivBy - Aktivitetsoversikt
+save_organization_next activitycalendarfrontend no Lagre
organisasjon og gå videre til Ny aktivitet
+new_organization activitycalendarfrontend no Ny organisasjon
+organization_saved_form activitycalendarfrontend no
Organisasjonen er opprettet i aktivitetsoversikten.<br/>Du kan nå registrere en
aktivitet tilknyttet den nye organisasjonen.
\ No newline at end of file
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity.php
===================================================================
---
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity.php
2012-05-09 12:39:39 UTC (rev 9338)
+++
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity.php
2012-05-09 12:41:33 UTC (rev 9339)
@@ -4,271 +4,6 @@
$act_so = activitycalendar_soactivity::get_instance();
$contpers_so = activitycalendar_socontactperson::get_instance();
?>
-<style>
-dl.proplist,
-dl.proplist-col {
- margin: 1em 0;
- padding-left: 2em;
-}
-dl.proplist dt,
-dl.proplist-col dt {
- font-style: italic;
- font-weight: bolder;
- font-size: 90%;
- margin: .8em 0 .1em 0;
-}
-
-dl.proplist-col,
-dl.form-col {
- width: 18em;
- float: left;
- text-align: left;
-}
-
-#frontend dl.proplist-col {
- width: 600px; !important
-}
-
-table#header {
- margin: 2em;
-
- }
-
-div#unit_selector {
-
-}
-
-div#all_units_key_data {
- padding-left: 2em;
- }
-
-div#unit_image {
- margin-left: 2em;
- }
-
-div#unit_image img {
- height:170px;
-}
-
-div.yui-navset {
- padding-left: 2em;
- padding-right: 2em;
- }
-
-div#contract_selector {
- padding-left: 1em;
- padding-top: 1em;
- }
-
-img.list_image {
- margin-right: 5px;
- float:left;
- }
-
-a.list_image {
- float:left;
- display:inline;
- }
-
-ol.list_image {
- float: left;
- }
-
-ol.list_image li {
- padding: 1px;
-}
-
-dl#key_data {
- padding: 2px;
- }
-
-
-dl#key_data dd {
- padding-bottom: 1em;
-}
-
-table#key_data td {
- padding-right: 1em;
- padding: 5px;
- }
-
-
-.user_menu {
- list-style:none;
- height: 100%;
- padding: 2px;
- border-style: none none none solid;
- border-width: 1px;
- border-color: grey;
- padding-left: 5px;
-}
-
-.user_menu li {
- margin: 13px;
- }
-
-#area_and_price {
- list-style:none;
- height: 100%;
- padding: 2px;
- padding-left: 5px;
- float:right;
- padding:0.5em 1em 0 0;
-}
-
-#area_and_price li {
- margin: 13px;
- }
-
-#org_units {
- list-style: none;
- height: 100%;
- padding: 2px;
- padding-left: 5px;
- float:right;
- padding:0.5em 1em 0 0;
-}
-
-#org_units li {
- margin: 13px;
- }
-
-#information {
- list-style:none;
- height: 100%;
- padding: 2px;
- padding-left: 5px;
- float:right;
- padding:0.5em 1em 0 0;
-}
-
-#information li {
- margin: 13px;
- }
-
-a.header_link {
- text-decoration: none;
- float: none;
- }
-
-#logo_holder {
- border: 0 none;
- font-family:Arial,sans-serif;
-font-size:65%;
-line-height:1.166;
-position: absolute;
-padding:2em;
-}
-
-em#bold {
- font-weight: bold;
- }
-
-div#header a {
- float: none;
-}
-
-.yui-skin-sam .yui-navset .yui-nav, .yui-skin-sam .yui-navset .yui-navset-top
.yui-nav {
- border-color: #BF0005;
- border-width:0 0 2px;
- }
-
-.yui-skin-sam .yui-navset .yui-content {
- background: none repeat scroll 0 0 #F4F2ED;
-}
-
-.yui-skin-sam .yui-navset .yui-nav .selected a, .yui-skin-sam .yui-navset
.yui-nav .selected a:focus, .yui-skin-sam .yui-navset .yui-nav .selected
a:hover {
- background:url("../../../../assets/skins/sam/sprite.png") repeat-x
scroll left -1400px #2647A0;
- }
-
-div.tickets {
- margin-top: 1em;
- }
-
-em.select_header {
- font-size: larger;
- padding-top: 10px;
- }
-
-#contract_price_and_area {
- float: left;
- margin: 1em 2em 0 0;
-}
-
-#contract_price_and_area li {
- margin-bottom: 1em;
- }
-
-#contract_essentials {
- float: left;
- margin: 1em 2em 0 2em;
- }
-
-#composites {
- float: left;
- margin: 1em 2em 0 2em;
- }
-
-
-#comment {
- float: left;
- margin: 1em 2em 0 2em;
- }
-
- #contract_essentials li {
- margin-bottom: 1em;
- }
-
-#contract_parts {
- float: left;
- margin: 1em 2em 0 2em;
- }
-
-div.toolbar {
-background-color:#EEEEEE;
-border:1px solid #BBBBBB;
-float:left;
-width:100%;
-}
-
-div.toolbar_manual {
-background-color:#EEEEEE;
-border:1px solid #BBBBBB;
-float:left;
-width:100%;
-}
-
-.yui-pg-container {
- white-space: normal;
- }
-
-li.ticket_detail {
- padding: 5px;
- margin-left: 5px;
- }
-
-div.success {
- font-weight: normal;
- margin:10px;
- padding:5px;
- font-size:1.1em;
- text-align: left;
- background-color: green;
- border:1px solid #9F6000;
- color: white;
-}
-
-div.error {
- font-weight: normal;
- margin:10px;
- padding:5px;
- font-size:1.1em;
- text-align: left;
- background-color: red;
- border:1px solid #9F6000;
- color: white;
-}
-</style>
<div class="yui-content" style="width: 100%;">
<div id="details">
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_edit.php
===================================================================
---
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_edit.php
2012-05-09 12:39:39 UTC (rev 9338)
+++
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_edit.php
2012-05-09 12:41:33 UTC (rev 9339)
@@ -14,10 +14,10 @@
<?php if($activity->get_group_id()){?>
//url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_groups&phpgw_return_as=json&orgid="
+ org_id + "&groupid=" + <?php echo $activity->get_group_id();?>;
- url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_groups&phpgw_return_as=json&orgid="
+ org_id + "&groupid=" + <?php echo $activity->get_group_id();?>;
+ url = "<?php echo
$ajaxURL?>index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_groups&phpgw_return_as=json&orgid="
+ org_id + "&groupid=" + <?php echo $activity->get_group_id();?>;
<?php }else{?>
//url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_groups&phpgw_return_as=json&orgid="
+ org_id;
- url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_groups&phpgw_return_as=json&orgid="
+ org_id;
+ url = "<?php echo
$ajaxURL?>index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_groups&phpgw_return_as=json&orgid="
+ org_id;
<?php }?>
if(org_id != null && org_id == 'new_org')
@@ -82,7 +82,7 @@
var div_address = document.getElementById('address_container');
//url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
- url =
"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=\"address\" id=\"address\" size\"5\">";
var divcontent_end = "</select>";
@@ -105,7 +105,7 @@
var div_address = document.getElementById('contact2_address_container');
//url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
- url =
"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\" id=\"address_cp2\"
size\"5\">";
var divcontent_end = "</select>";
@@ -157,271 +157,7 @@
}
</script>
-<style>
-dl.proplist,
-dl.proplist-col {
- margin: 1em 0;
- padding-left: 2em;
-}
-dl.proplist dt,
-dl.proplist-col dt {
- font-style: italic;
- font-weight: bolder;
- font-size: 90%;
- margin: .8em 0 .1em 0;
-}
-dl.proplist-col,
-dl.form-col {
- width: 18em;
- float: left;
- text-align: left;
-}
-
-#frontend dl.proplist-col {
- width: 600px; !important
-}
-
-table#header {
- margin: 2em;
-
- }
-
-div#unit_selector {
-
-}
-
-div#all_units_key_data {
- padding-left: 2em;
- }
-
-div#unit_image {
- margin-left: 2em;
- }
-
-div#unit_image img {
- height:170px;
-}
-
-div.yui-navset {
- padding-left: 2em;
- padding-right: 2em;
- }
-
-div#contract_selector {
- padding-left: 1em;
- padding-top: 1em;
- }
-
-img.list_image {
- margin-right: 5px;
- float:left;
- }
-
-a.list_image {
- float:left;
- display:inline;
- }
-
-ol.list_image {
- float: left;
- }
-
-ol.list_image li {
- padding: 1px;
-}
-
-dl#key_data {
- padding: 2px;
- }
-
-
-dl#key_data dd {
- padding-bottom: 1em;
-}
-
-table#key_data td {
- padding-right: 1em;
- padding: 5px;
- }
-
-
-.user_menu {
- list-style:none;
- height: 100%;
- padding: 2px;
- border-style: none none none solid;
- border-width: 1px;
- border-color: grey;
- padding-left: 5px;
-}
-
-.user_menu li {
- margin: 13px;
- }
-
-#area_and_price {
- list-style:none;
- height: 100%;
- padding: 2px;
- padding-left: 5px;
- float:right;
- padding:0.5em 1em 0 0;
-}
-
-#area_and_price li {
- margin: 13px;
- }
-
-#org_units {
- list-style: none;
- height: 100%;
- padding: 2px;
- padding-left: 5px;
- float:right;
- padding:0.5em 1em 0 0;
-}
-
-#org_units li {
- margin: 13px;
- }
-
-#information {
- list-style:none;
- height: 100%;
- padding: 2px;
- padding-left: 5px;
- float:right;
- padding:0.5em 1em 0 0;
-}
-
-#information li {
- margin: 13px;
- }
-
-a.header_link {
- text-decoration: none;
- float: none;
- }
-
-#logo_holder {
- border: 0 none;
- font-family:Arial,sans-serif;
-font-size:65%;
-line-height:1.166;
-position: absolute;
-padding:2em;
-}
-
-em#bold {
- font-weight: bold;
- }
-
-div#header a {
- float: none;
-}
-
-.yui-skin-sam .yui-navset .yui-nav, .yui-skin-sam .yui-navset .yui-navset-top
.yui-nav {
- border-color: #BF0005;
- border-width:0 0 2px;
- }
-
-.yui-skin-sam .yui-navset .yui-content {
- background: none repeat scroll 0 0 #F4F2ED;
-}
-
-.yui-skin-sam .yui-navset .yui-nav .selected a, .yui-skin-sam .yui-navset
.yui-nav .selected a:focus, .yui-skin-sam .yui-navset .yui-nav .selected
a:hover {
- background:url("../../../../assets/skins/sam/sprite.png") repeat-x
scroll left -1400px #2647A0;
- }
-
-div.tickets {
- margin-top: 1em;
- }
-
-em.select_header {
- font-size: larger;
- padding-top: 10px;
- }
-
-#contract_price_and_area {
- float: left;
- margin: 1em 2em 0 0;
-}
-
-#contract_price_and_area li {
- margin-bottom: 1em;
- }
-
-#contract_essentials {
- float: left;
- margin: 1em 2em 0 2em;
- }
-
-#composites {
- float: left;
- margin: 1em 2em 0 2em;
- }
-
-
-#comment {
- float: left;
- margin: 1em 2em 0 2em;
- }
-
- #contract_essentials li {
- margin-bottom: 1em;
- }
-
-#contract_parts {
- float: left;
- margin: 1em 2em 0 2em;
- }
-
-div.toolbar {
-background-color:#EEEEEE;
-border:1px solid #BBBBBB;
-float:left;
-width:100%;
-}
-
-div.toolbar_manual {
-background-color:#EEEEEE;
-border:1px solid #BBBBBB;
-float:left;
-width:100%;
-}
-
-.yui-pg-container {
- white-space: normal;
- }
-
-li.ticket_detail {
- padding: 5px;
- margin-left: 5px;
- }
-
-div.success {
- font-weight: normal;
- margin:10px;
- padding:5px;
- font-size:1.1em;
- text-align: left;
- background-color: green;
- border:1px solid #9F6000;
- color: white;
-}
-
-div.error {
- font-weight: normal;
- margin:10px;
- padding:5px;
- font-size:1.1em;
- text-align: left;
- background-color: red;
- border:1px solid #9F6000;
- color: white;
-}
-</style>
<div class="yui-content" style="width: 100%;">
<div id="details">
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_edit_step_1.php
===================================================================
---
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_edit_step_1.php
2012-05-09 12:39:39 UTC (rev 9338)
+++
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_edit_step_1.php
2012-05-09 12:41:33 UTC (rev 9339)
@@ -17,8 +17,7 @@
var org_id = document.getElementById('organization_id').value;
var div_select = document.getElementById('activity_select');
- //url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_activities&phpgw_return_as=json&orgid="
+ org_id;
- url =
"index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_activities&phpgw_return_as=json&orgid="
+ org_id;
+ url = "<?php echo
$ajaxURL?>index.php?menuaction=activitycalendarfrontend.uiactivity.get_organization_activities&phpgw_return_as=json&orgid="
+ org_id;
var divcontent_start = "<select name=\"activity_id\" id=\"activity_id\">";
var divcontent_end = "</select>";
@@ -40,271 +39,7 @@
get_activities();
});
</script>
-<style>
-dl.proplist,
-dl.proplist-col {
- margin: 1em 0;
- padding-left: 2em;
-}
-dl.proplist dt,
-dl.proplist-col dt {
- font-style: italic;
- font-weight: bolder;
- font-size: 90%;
- margin: .8em 0 .1em 0;
-}
-dl.proplist-col,
-dl.form-col {
- width: 18em;
- float: left;
- text-align: left;
-}
-
-#frontend dl.proplist-col {
- width: 600px; !important
-}
-
-table#header {
- margin: 2em;
-
- }
-
-div#unit_selector {
-
-}
-
-div#all_units_key_data {
- padding-left: 2em;
- }
-
-div#unit_image {
- margin-left: 2em;
- }
-
-div#unit_image img {
- height:170px;
-}
-
-div.yui-navset {
- padding-left: 2em;
- padding-right: 2em;
- }
-
-div#contract_selector {
- padding-left: 1em;
- padding-top: 1em;
- }
-
-img.list_image {
- margin-right: 5px;
- float:left;
- }
-
-a.list_image {
- float:left;
- display:inline;
- }
-
-ol.list_image {
- float: left;
- }
-
-ol.list_image li {
- padding: 1px;
-}
-
-dl#key_data {
- padding: 2px;
- }
-
-
-dl#key_data dd {
- padding-bottom: 1em;
-}
-
-table#key_data td {
- padding-right: 1em;
- padding: 5px;
- }
-
-
-.user_menu {
- list-style:none;
- height: 100%;
- padding: 2px;
- border-style: none none none solid;
- border-width: 1px;
- border-color: grey;
- padding-left: 5px;
-}
-
-.user_menu li {
- margin: 13px;
- }
-
-#area_and_price {
- list-style:none;
- height: 100%;
- padding: 2px;
- padding-left: 5px;
- float:right;
- padding:0.5em 1em 0 0;
-}
-
-#area_and_price li {
- margin: 13px;
- }
-
-#org_units {
- list-style: none;
- height: 100%;
- padding: 2px;
- padding-left: 5px;
- float:right;
- padding:0.5em 1em 0 0;
-}
-
-#org_units li {
- margin: 13px;
- }
-
-#information {
- list-style:none;
- height: 100%;
- padding: 2px;
- padding-left: 5px;
- float:right;
- padding:0.5em 1em 0 0;
-}
-
-#information li {
- margin: 13px;
- }
-
-a.header_link {
- text-decoration: none;
- float: none;
- }
-
-#logo_holder {
- border: 0 none;
- font-family:Arial,sans-serif;
-font-size:65%;
-line-height:1.166;
-position: absolute;
-padding:2em;
-}
-
-em#bold {
- font-weight: bold;
- }
-
-div#header a {
- float: none;
-}
-
-.yui-skin-sam .yui-navset .yui-nav, .yui-skin-sam .yui-navset .yui-navset-top
.yui-nav {
- border-color: #BF0005;
- border-width:0 0 2px;
- }
-
-.yui-skin-sam .yui-navset .yui-content {
- background: none repeat scroll 0 0 #F4F2ED;
-}
-
-.yui-skin-sam .yui-navset .yui-nav .selected a, .yui-skin-sam .yui-navset
.yui-nav .selected a:focus, .yui-skin-sam .yui-navset .yui-nav .selected
a:hover {
- background:url("../../../../assets/skins/sam/sprite.png") repeat-x
scroll left -1400px #2647A0;
- }
-
-div.tickets {
- margin-top: 1em;
- }
-
-em.select_header {
- font-size: larger;
- padding-top: 10px;
- }
-
-#contract_price_and_area {
- float: left;
- margin: 1em 2em 0 0;
-}
-
-#contract_price_and_area li {
- margin-bottom: 1em;
- }
-
-#contract_essentials {
- float: left;
- margin: 1em 2em 0 2em;
- }
-
-#composites {
- float: left;
- margin: 1em 2em 0 2em;
- }
-
-
-#comment {
- float: left;
- margin: 1em 2em 0 2em;
- }
-
- #contract_essentials li {
- margin-bottom: 1em;
- }
-
-#contract_parts {
- float: left;
- margin: 1em 2em 0 2em;
- }
-
-div.toolbar {
-background-color:#EEEEEE;
-border:1px solid #BBBBBB;
-float:left;
-width:100%;
-}
-
-div.toolbar_manual {
-background-color:#EEEEEE;
-border:1px solid #BBBBBB;
-float:left;
-width:100%;
-}
-
-.yui-pg-container {
- white-space: normal;
- }
-
-li.ticket_detail {
- padding: 5px;
- margin-left: 5px;
- }
-
-div.success {
- font-weight: normal;
- margin:10px;
- padding:5px;
- font-size:1.1em;
- text-align: left;
- background-color: green;
- border:1px solid #9F6000;
- color: white;
-}
-
-div.error {
- font-weight: normal;
- margin:10px;
- padding:5px;
- font-size:1.1em;
- text-align: left;
- background-color: red;
- border:1px solid #9F6000;
- color: white;
-}
-</style>
<div class="yui-content" style="width: 100%;">
<h1><?php echo lang('edit_activity');?></h1>
<form action="#" method="post">
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_new.php
===================================================================
---
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_new.php
2012-05-09 12:39:39 UTC (rev 9338)
+++
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_new.php
2012-05-09 12:41:33 UTC (rev 9339)
@@ -39,7 +39,7 @@
var div_address = document.getElementById('address_container');
//url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
- url =
"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=\"address\" id=\"address\" size\"5\">";
var divcontent_end = "</select>";
@@ -62,7 +62,7 @@
var div_address = document.getElementById('arena_address_container');
//url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
- url =
"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=\"arena_address\" id=\"arena_address\"
size\"5\">";
var divcontent_end = "</select>";
@@ -85,7 +85,7 @@
var div_address = document.getElementById('contact2_address_container');
//url =
"/aktivby/registreringsskjema/ny/index.php?menuaction=activitycalendarfrontend.uiactivity.get_address_search&phpgw_return_as=json&search="
+ address;
- url =
"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\" id=\"address_cp2\"
size\"5\">";
var divcontent_end = "</select>";
@@ -173,271 +173,7 @@
}
</script>
-<style>
-dl.proplist,
-dl.proplist-col {
- margin: 1em 0;
- padding-left: 2em;
-}
-dl.proplist dt,
-dl.proplist-col dt {
- font-style: italic;
- font-weight: bolder;
- font-size: 90%;
- margin: .8em 0 .1em 0;
-}
-dl.proplist-col,
-dl.form-col {
- width: 18em;
- float: left;
- text-align: left;
-}
-
-#frontend dl.proplist-col {
- width: 600px; !important
-}
-
-table#header {
- margin: 2em;
-
- }
-
-div#unit_selector {
-
-}
-
-div#all_units_key_data {
- padding-left: 2em;
- }
-
-div#unit_image {
- margin-left: 2em;
- }
-
-div#unit_image img {
- height:170px;
-}
-
-div.yui-navset {
- padding-left: 2em;
- padding-right: 2em;
- }
-
-div#contract_selector {
- padding-left: 1em;
- padding-top: 1em;
- }
-
-img.list_image {
- margin-right: 5px;
- float:left;
- }
-
-a.list_image {
- float:left;
- display:inline;
- }
-
-ol.list_image {
- float: left;
- }
-
-ol.list_image li {
- padding: 1px;
-}
-
-dl#key_data {
- padding: 2px;
- }
-
-
-dl#key_data dd {
- padding-bottom: 1em;
-}
-
-table#key_data td {
- padding-right: 1em;
- padding: 5px;
- }
-
-
-.user_menu {
- list-style:none;
- height: 100%;
- padding: 2px;
- border-style: none none none solid;
- border-width: 1px;
- border-color: grey;
- padding-left: 5px;
-}
-
-.user_menu li {
- margin: 13px;
- }
-
-#area_and_price {
- list-style:none;
- height: 100%;
- padding: 2px;
- padding-left: 5px;
- float:right;
- padding:0.5em 1em 0 0;
-}
-
-#area_and_price li {
- margin: 13px;
- }
-
-#org_units {
- list-style: none;
- height: 100%;
- padding: 2px;
- padding-left: 5px;
- float:right;
- padding:0.5em 1em 0 0;
-}
-
-#org_units li {
- margin: 13px;
- }
-
-#information {
- list-style:none;
- height: 100%;
- padding: 2px;
- padding-left: 5px;
- float:right;
- padding:0.5em 1em 0 0;
-}
-
-#information li {
- margin: 13px;
- }
-
-a.header_link {
- text-decoration: none;
- float: none;
- }
-
-#logo_holder {
- border: 0 none;
- font-family:Arial,sans-serif;
-font-size:65%;
-line-height:1.166;
-position: absolute;
-padding:2em;
-}
-
-em#bold {
- font-weight: bold;
- }
-
-div#header a {
- float: none;
-}
-
-.yui-skin-sam .yui-navset .yui-nav, .yui-skin-sam .yui-navset .yui-navset-top
.yui-nav {
- border-color: #BF0005;
- border-width:0 0 2px;
- }
-
-.yui-skin-sam .yui-navset .yui-content {
- background: none repeat scroll 0 0 #F4F2ED;
-}
-
-.yui-skin-sam .yui-navset .yui-nav .selected a, .yui-skin-sam .yui-navset
.yui-nav .selected a:focus, .yui-skin-sam .yui-navset .yui-nav .selected
a:hover {
- background:url("../../../../assets/skins/sam/sprite.png") repeat-x
scroll left -1400px #2647A0;
- }
-
-div.tickets {
- margin-top: 1em;
- }
-
-em.select_header {
- font-size: larger;
- padding-top: 10px;
- }
-
-#contract_price_and_area {
- float: left;
- margin: 1em 2em 0 0;
-}
-
-#contract_price_and_area li {
- margin-bottom: 1em;
- }
-
-#contract_essentials {
- float: left;
- margin: 1em 2em 0 2em;
- }
-
-#composites {
- float: left;
- margin: 1em 2em 0 2em;
- }
-
-
-#comment {
- float: left;
- margin: 1em 2em 0 2em;
- }
-
- #contract_essentials li {
- margin-bottom: 1em;
- }
-
-#contract_parts {
- float: left;
- margin: 1em 2em 0 2em;
- }
-
-div.toolbar {
-background-color:#EEEEEE;
-border:1px solid #BBBBBB;
-float:left;
-width:100%;
-}
-
-div.toolbar_manual {
-background-color:#EEEEEE;
-border:1px solid #BBBBBB;
-float:left;
-width:100%;
-}
-
-.yui-pg-container {
- white-space: normal;
- }
-
-li.ticket_detail {
- padding: 5px;
- margin-left: 5px;
- }
-
-div.success {
- font-weight: normal;
- margin:10px;
- padding:5px;
- font-size:1.1em;
- text-align: left;
- background-color: green;
- border:1px solid #9F6000;
- color: white;
-}
-
-div.error {
- font-weight: normal;
- margin:10px;
- padding:5px;
- font-size:1.1em;
- text-align: left;
- background-color: red;
- border:1px solid #9F6000;
- color: white;
-}
-</style>
<div class="yui-content" style="width: 100%;">
<div id="details">
@@ -594,102 +330,53 @@
?>
</select>
</dd>
+ <dt>Kontaktinformasjon for kulturkontoret</dt>
+ <dt><label
for="contact2_address">Adresse</label>
+ <dd><input type="text"
name="contact2_address_txt" id="contact2_address_txt"
onkeyup="javascript:get_address_search_cp2()"/>
+ <div id="contact2_address_container"></div></dd>
+ <dt><label
for="contact2_number">Husnummer</label></dt>
+ <dd><input type="text"
name="contact2_number"/></dd>
+ <dt><label
for="contact2_postaddress">Postnummer og Sted</label>
+ <dd><input type="text"
name="contact2_postaddress" size="100"/></dd>
<hr />
<h2><?php echo lang('who')?></h2>
<dt>
<label for="organization_id"><?php echo
lang('organization') ?></label>
</dt>
- <?php if($new_org){?>
- <input type="hidden"
name="new_org" id="new_org" value="yes" />
- <?php }?>
- <?php if($new_organization){?>
- <input type="hidden"
name="organization_id" id="organization_id" value="new_org" />
- <dt><label
for="orgname">Organisasjonsnavn</label></dt>
- <dd><input type="text"
name="orgname" size="100"/></dd>
- <dt><label
for="orgno">Organisasjonsnummer</label></dt>
- <dd><input type="text"
name="orgno"/></dd>
- <dt><label
for="district">Bydel</label></dt>
- <dd><select name="org_district">
- <option
value="0">Ingen bydel valgt</option>
- <?php
- foreach($districts as $d)
- {
- ?>
- <option value="<?php
echo $d['part_of_town_id']?>"><?php echo $d['name']?></option>
- <?php
- }?>
- </select></dd>
- <dt><label
for="homepage">Hjemmeside</label></dt>
- <dd><input type="text"
name="homepage" size="100"/></dd>
- <dt><label
for="email">E-post</label></dt>
- <dd><input type="text"
name="email"/></dd>
- <dt><label
for="phone">Telefon</label></dt>
- <dd><input type="text"
name="phone"/></dd>
- <dt><label
for="street">Gate</label></dt>
- <dd><input type="text"
name="address_txt" id="address_txt" onkeyup="javascript:get_address_search()"/>
- <div
id="address_container"></div>
- <label
for="number">Nummer</label>
- <input type="text"
name="number"/><br/>
- <label
for="postaddress">Postnummer og Sted</label>
- <input type="text"
name="postaddress" size="100"/></dd>
- <dt><label
for="org_description">Beskrivelse</label></dt>
- <dd><textarea rows="10"
cols="100" name="org_description"></textarea></dd>
- <hr/>
- <b>Kontaktperson 1</b><br/>
- <dt><label
for="contact1_name">Navn</label>
- <input type="text"
name="org_contact1_name" size="100"/><br/>
- <dt><label
for="contact1_phone">Telefon</label>
- <input type="text"
name="org_contact1_phone"/><br/>
- <dt><label
for="contact1_mail">E-post</label>
- <input type="text"
name="org_contact1_mail"/><br/>
- <b>Kontaktperson 2</b><br/>
- <dt><label
for="contact2_name">Navn</label>
- <input type="text"
name="org_contact2_name" size="100"/><br/>
- <dt><label
for="contact2_phone">Telefon</label>
- <input type="text"
name="org_contact2_phone"/><br/>
- <dt><label
for="contact2_mail">E-post</label>
- <input type="text"
name="org_contact2_mail"/><br/>
- <dt><label
for="contact2_address">Adresse</label>
- <input type="text"
name="contact2_address_txt" id="contact2_address_txt"
onkeyup="javascript:get_address_search_cp2()"/>
- <div
id="contact2_address_container"></div><br/>
- <label
for="contact2_number">Nummer</label>
- <input type="text"
name="org_contact2_number"/><br/>
- <dt><label
for="contact2_postaddress">Postnummer og Sted</label>
- <input type="text"
name="org_contact2_postaddress" size="100"/>
- <hr/>
- <?php }else{?>
- <input type="hidden"
name="organization_id" id="organization_id" value="<?php echo
$organization->get_id()?>" />
- <dt><label
for="orgname">Organisasjonsnavn</label></dt>
- <dd><?php echo
$organization->get_name()?></dd>
- <dt><label
for="orgno">Organisasjonsnummer</label></dt>
- <dd><?php echo
$organization->get_organization_number()?></dd>
- <dt><label
for="homepage">Hjemmeside</label></dt>
- <dd><?php echo
$organization->get_homepage()?></dd>
- <dt><label
for="email">E-post</label></dt>
- <dd><?php echo
$organization->get_email()?></dd>
- <dt><label
for="phone">Telefon</label></dt>
- <dd><?php echo
$organization->get_phone()?></dd>
- <dt><label
for="street">Adresse</label></dt>
- <dd><?php echo
$organization->get_address()?></dd>
- <dt><label
for="org_description">Beskrivelse av aktiviteten</label></dt>
- <dd><?php echo
$organization->get_description()?></dd>
- <hr/>
- <dt>Kontaktperson 1</dt>
- <dt><label
for="contact1_name">Navn</label></dt>
- <dd><?php echo
isset($contact1)?$contact1->get_name():''?></dd>
- <dt><label
for="contact1_phone">Telefon</label></dt>
- <dd><?php echo
isset($contact1)?$contact1->get_phone():''?></dd>
- <dt><label
for="contact1_mail">E-post</label></dt>
- <dd><?php echo
isset($contact1)?$contact1->get_email():''?></dd>
- <dt>Kontaktperson 2</dt>
- <dt><label
for="contact2_name">Navn</label></dt>
- <dd><?php echo
isset($contact2)?$contact2->get_name():''?></dd>
- <dt><label
for="contact2_phone">Telefon</label></dt>
- <dd><?php echo
isset($contact2)?$contact2->get_phone():''?></dd>
- <dt><label
for="contact2_mail">E-post</label></dt>
- <dd><?php echo
isset($contact2)?$contact2->get_email():''?></dd>
- <hr/>
- <?php }?>
+ <?php if($new_organization){?>
+ <input type="hidden" name="new_org"
id="new_org" value="yes" />
+ <?php }?>
+ <input type="hidden"
name="organization_id" id="organization_id" value="<?php echo
$organization->get_id()?>" />
+ <dt><label
for="orgname">Organisasjonsnavn</label></dt>
+ <dd><?php echo
$organization->get_name()?></dd>
+ <dt><label
for="orgno">Organisasjonsnummer</label></dt>
+ <dd><?php echo
$organization->get_organization_number()?></dd>
+ <dt><label
for="homepage">Hjemmeside</label></dt>
+ <dd><?php echo
$organization->get_homepage()?></dd>
+ <dt><label
for="email">E-post</label></dt>
+ <dd><?php echo
$organization->get_email()?></dd>
+ <dt><label
for="phone">Telefon</label></dt>
+ <dd><?php echo
$organization->get_phone()?></dd>
+ <dt><label
for="street">Adresse</label></dt>
+ <dd><?php echo
$organization->get_address()?></dd>
+ <dt><label
for="org_description">Beskrivelse av aktiviteten</label></dt>
+ <dd><?php echo
$organization->get_description()?></dd>
+ <hr/>
+ <dt>Kontaktperson 1</dt>
+ <dt><label for="contact1_name">Navn</label></dt>
+ <dd><?php echo
isset($contact1)?$contact1->get_name():''?></dd>
+ <dt><label
for="contact1_phone">Telefon</label></dt>
+ <dd><?php echo
isset($contact1)?$contact1->get_phone():''?></dd>
+ <dt><label
for="contact1_mail">E-post</label></dt>
+ <dd><?php echo
isset($contact1)?$contact1->get_email():''?></dd>
+ <dt>Kontaktperson 2</dt>
+ <dt><label for="contact2_name">Navn</label></dt>
+ <dd><?php echo
isset($contact2)?$contact2->get_name():''?></dd>
+ <dt><label
for="contact2_phone">Telefon</label></dt>
+ <dd><?php echo
isset($contact2)?$contact2->get_phone():''?></dd>
+ <dt><label
for="contact2_mail">E-post</label></dt>
+ <dd><?php echo
isset($contact2)?$contact2->get_email():''?></dd>
+ <hr/>
<?php if(!$new_organization){?>
<dt>
<label for="group_id"
id="group_label"><?php echo lang('group') ?></label>
@@ -724,13 +411,6 @@
<dd><input type="text"
name="group_contact2_phone" value="<?php echo
isset($contact2)?$contact2->get_phone():''?>"/></dd>
<dt><label
for="contact2_mail">E-post</label></dt>
<dd><input type="text"
name="group_contact2_mail" value="<?php echo
isset($contact2)?$contact2->get_email():''?>"/></dd>
- <dt><label
for="contact2_address">Adresse</label></dt>
- <dd><input type="text"
name="contact2_address_txt" id="contact2_address_txt"
onkeyup="javascript:get_address_search_cp2()" />
- <div
id="contact2_address_container"></div><br/>
- <label
for="contact2_number">Nummer</label>
- <input type="text"
name="group_contact2_number"/><br/>
- <label
for="contact2_postaddress">Postnummer og Sted</label>
- <input type="text"
name="group_contact2_postaddress"/></dd>
<hr/>
</span>
<?php }?>
Copied:
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_new_org.php
(from rev 9338,
trunk/activitycalendarfrontend/templates/base/activity_new_org.php)
===================================================================
---
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_new_org.php
(rev 0)
+++
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_new_org.php
2012-05-09 12:41:33 UTC (rev 9339)
@@ -0,0 +1,169 @@
+<?php
+ //include common logic for all templates
+// include("common.php");
+ $act_so = activitycalendar_soactivity::get_instance();
+ $contpers_so = activitycalendar_socontactperson::get_instance();
+?>
+
+<script type="text/javascript">
+
+function checkNewGroup()
+{
+ var group_selected = document.getElementById('group_id').value;
+ if(group_selected == 'new_group')
+ {
+ document.getElementById('new_group_fields').style.display =
"block";
+ }
+ else
+ {
+ document.getElementById('new_group_fields').style.display =
"none";
+ }
+}
+
+function get_address_search()
+{
+ var address = document.getElementById('address_txt').value;
+ var div_address = document.getElementById('address_container');
+
+ //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=\"address\" id=\"address\" size\"5\">";
+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 allOK()
+{
+ if(document.getElementById('orgname').value == null ||
document.getElementById('orgname').value == '')
+ {
+ alert("Organisasjonsnavn må fylles ut!");
+ return false;
+ }
+ if(document.getElementById('org_district').value == null ||
document.getElementById('org_district').value == 0)
+ {
+ alert("Bydel må fylles ut!");
+ return false;
+ }
+ if(document.getElementById('phone').value == null ||
document.getElementById('phone').value == '')
+ {
+ alert("Telefonnummer for organisasjonen må fylles ut!");
+ return false;
+ }
+ if(document.getElementById('address').value == null ||
document.getElementById('address').value == 0)
+ {
+ alert("Gateadresse må fylles ut!");
+ return false;
+ }
+ if(document.getElementById('postaddress').value == null ||
document.getElementById('postaddress').value == '')
+ {
+ alert("Postnummer og sted må fylles ut!");
+ return false;
+ }
+ if(document.getElementById('org_description').value == null ||
document.getElementById('org_description').value == '')
+ {
+ alert("Beskrivelse for organisasjonen må fylles ut!");
+ return false;
+ }
+ if(document.getElementById('org_contact1_name').value == null ||
document.getElementById('org_contact1_name').value == '')
+ {
+ alert("Navn på kontaktperson 1 må fylles ut!");
+ return false;
+ }
+ if(document.getElementById('org_contact1_mail').value == null ||
document.getElementById('org_contact1_mail').value == '')
+ {
+ if(document.getElementById('org_contact1_phone').value == null
|| document.getElementById('org_contact1_phone').value == '')
+ {
+ alert("E-post eller telefon for kontaktperson 1 må
fylles ut!");
+ return false;
+ }
+ }
+ else
+ return true;
+}
+
+</script>
+
+<div class="yui-content" style="width: 100%;">
+ <div id="details">
+
+ <?php if($message){?>
+ <div class="success">
+ <?php echo $message;?>
+ </div>
+ <?php }else if($error){?>
+ <div class="error">
+ <?php echo $error;?>
+ </div>
+ <?php }?>
+ </div>
+ <h1><?php echo lang('new_organization') ?></h1>
+ <form action="#" method="post">
+ <input type="hidden" name="activity" value="<?php
if($activity->get_id()){ echo $activity->get_id(); } else { echo '0'; } ?>"/>
+ <dl class="proplist-col" style="width: 200%">
+ <input type="hidden" name="organization_id"
id="organization_id" value="new_org" />
+ <dt><label
for="orgname">Organisasjonsnavn</label></dt>
+ <dd><input type="text" name="orgname"
size="100"/></dd>
+ <dt><label
for="orgno">Organisasjonsnummer</label></dt>
+ <dd><input type="text" name="orgno"/></dd>
+ <dt><label for="district">Bydel</label></dt>
+ <dd><select name="org_district">
+ <option value="0">Ingen bydel
valgt</option>
+ <?php
+ foreach($districts as $d)
+ {
+ ?>
+ <option value="<?php echo
$d['part_of_town_id']?>"><?php echo $d['name']?></option>
+ <?php
+ }?>
+ </select></dd>
+ <dt><label
for="homepage">Hjemmeside</label></dt>
+ <dd><input type="text" name="homepage"
size="100"/></dd>
+ <dt><label for="email">E-post</label></dt>
+ <dd><input type="text" name="email"/></dd>
+ <dt><label for="phone">Telefon</label></dt>
+ <dd><input type="text" name="phone"/></dd>
+ <dt><label for="street">Gate</label></dt>
+ <dd><input type="text" name="address_txt"
id="address_txt" onkeyup="javascript:get_address_search()"/>
+ <div id="address_container"></div></dd>
+ <dt><label for="number">Husnummer</label></dt>
+ <dd><input type="text" name="number"/><br/></dd>
+ <dt><label for="postaddress">Postnummer og
Sted</label></dt>
+ <dd><input type="text" name="postaddress"
size="100"/></dd>
+ <dt><label
for="org_description">Beskrivelse</label></dt>
+ <dd><textarea rows="10" cols="100"
name="org_description"></textarea></dd>
+ <hr/>
+ <b>Kontaktperson 1</b><br/>
+ <dt><label for="contact1_name">Navn</label>
+ <input type="text" name="org_contact1_name"
size="100"/></dt>
+ <dt><label for="contact1_phone">Telefon</label>
+ <input type="text"
name="org_contact1_phone"/></dt>
+ <dt><label for="contact1_mail">E-post</label>
+ <input type="text"
name="org_contact1_mail"/></dt><br/><br/><br/>
+ <b>Kontaktperson 2</b><br/>
+ <dt><label for="contact2_name">Navn</label>
+ <input type="text" name="org_contact2_name"
size="100"/></dt>
+ <dt><label for="contact2_phone">Telefon</label>
+ <input type="text"
name="org_contact2_phone"/></dt>
+ <dt><label for="contact2_mail">E-post</label>
+ <input type="text"
name="org_contact2_mail"/></dt>
+ <hr/>
+ <div class="form-buttons">
+ <input type="submit"
name="save_organization" value="<?php echo lang('save_organization_next') ?>"
onclick="return allOK();"/>
+ </div>
+ </dl>
+
+ </form>
+
+ </div>
+</div>
\ No newline at end of file
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_new_step_1.php
===================================================================
---
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_new_step_1.php
2012-05-09 12:39:39 UTC (rev 9338)
+++
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_new_step_1.php
2012-05-09 12:41:33 UTC (rev 9339)
@@ -13,271 +13,7 @@
}
}
</script>
-<style>
-dl.proplist,
-dl.proplist-col {
- margin: 1em 0;
- padding-left: 2em;
-}
-dl.proplist dt,
-dl.proplist-col dt {
- font-style: italic;
- font-weight: bolder;
- font-size: 90%;
- margin: .8em 0 .1em 0;
-}
-dl.proplist-col,
-dl.form-col {
- width: 18em;
- float: left;
- text-align: left;
-}
-
-#frontend dl.proplist-col {
- width: 600px; !important
-}
-
-table#header {
- margin: 2em;
-
- }
-
-div#unit_selector {
-
-}
-
-div#all_units_key_data {
- padding-left: 2em;
- }
-
-div#unit_image {
- margin-left: 2em;
- }
-
-div#unit_image img {
- height:170px;
-}
-
-div.yui-navset {
- padding-left: 2em;
- padding-right: 2em;
- }
-
-div#contract_selector {
- padding-left: 1em;
- padding-top: 1em;
- }
-
-img.list_image {
- margin-right: 5px;
- float:left;
- }
-
-a.list_image {
- float:left;
- display:inline;
- }
-
-ol.list_image {
- float: left;
- }
-
-ol.list_image li {
- padding: 1px;
-}
-
-dl#key_data {
- padding: 2px;
- }
-
-
-dl#key_data dd {
- padding-bottom: 1em;
-}
-
-table#key_data td {
- padding-right: 1em;
- padding: 5px;
- }
-
-
-.user_menu {
- list-style:none;
- height: 100%;
- padding: 2px;
- border-style: none none none solid;
- border-width: 1px;
- border-color: grey;
- padding-left: 5px;
-}
-
-.user_menu li {
- margin: 13px;
- }
-
-#area_and_price {
- list-style:none;
- height: 100%;
- padding: 2px;
- padding-left: 5px;
- float:right;
- padding:0.5em 1em 0 0;
-}
-
-#area_and_price li {
- margin: 13px;
- }
-
-#org_units {
- list-style: none;
- height: 100%;
- padding: 2px;
- padding-left: 5px;
- float:right;
- padding:0.5em 1em 0 0;
-}
-
-#org_units li {
- margin: 13px;
- }
-
-#information {
- list-style:none;
- height: 100%;
- padding: 2px;
- padding-left: 5px;
- float:right;
- padding:0.5em 1em 0 0;
-}
-
-#information li {
- margin: 13px;
- }
-
-a.header_link {
- text-decoration: none;
- float: none;
- }
-
-#logo_holder {
- border: 0 none;
- font-family:Arial,sans-serif;
-font-size:65%;
-line-height:1.166;
-position: absolute;
-padding:2em;
-}
-
-em#bold {
- font-weight: bold;
- }
-
-div#header a {
- float: none;
-}
-
-.yui-skin-sam .yui-navset .yui-nav, .yui-skin-sam .yui-navset .yui-navset-top
.yui-nav {
- border-color: #BF0005;
- border-width:0 0 2px;
- }
-
-.yui-skin-sam .yui-navset .yui-content {
- background: none repeat scroll 0 0 #F4F2ED;
-}
-
-.yui-skin-sam .yui-navset .yui-nav .selected a, .yui-skin-sam .yui-navset
.yui-nav .selected a:focus, .yui-skin-sam .yui-navset .yui-nav .selected
a:hover {
- background:url("../../../../assets/skins/sam/sprite.png") repeat-x
scroll left -1400px #2647A0;
- }
-
-div.tickets {
- margin-top: 1em;
- }
-
-em.select_header {
- font-size: larger;
- padding-top: 10px;
- }
-
-#contract_price_and_area {
- float: left;
- margin: 1em 2em 0 0;
-}
-
-#contract_price_and_area li {
- margin-bottom: 1em;
- }
-
-#contract_essentials {
- float: left;
- margin: 1em 2em 0 2em;
- }
-
-#composites {
- float: left;
- margin: 1em 2em 0 2em;
- }
-
-
-#comment {
- float: left;
- margin: 1em 2em 0 2em;
- }
-
- #contract_essentials li {
- margin-bottom: 1em;
- }
-
-#contract_parts {
- float: left;
- margin: 1em 2em 0 2em;
- }
-
-div.toolbar {
-background-color:#EEEEEE;
-border:1px solid #BBBBBB;
-float:left;
-width:100%;
-}
-
-div.toolbar_manual {
-background-color:#EEEEEE;
-border:1px solid #BBBBBB;
-float:left;
-width:100%;
-}
-
-.yui-pg-container {
- white-space: normal;
- }
-
-li.ticket_detail {
- padding: 5px;
- margin-left: 5px;
- }
-
-div.success {
- font-weight: normal;
- margin:10px;
- padding:5px;
- font-size:1.1em;
- text-align: left;
- background-color: green;
- border:1px solid #9F6000;
- color: white;
-}
-
-div.error {
- font-weight: normal;
- margin:10px;
- padding:5px;
- font-size:1.1em;
- text-align: left;
- background-color: red;
- border:1px solid #9F6000;
- color: white;
-}
-</style>
<div class="yui-content" style="width: 100%;">
<h1><?php echo lang('new_activity') ?></h1>
<form action="#" method="post">
Copied:
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/config.tpl
(from rev 9338, trunk/activitycalendarfrontend/templates/base/config.tpl)
===================================================================
---
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/config.tpl
(rev 0)
+++
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/config.tpl
2012-05-09 12:41:33 UTC (rev 9339)
@@ -0,0 +1,50 @@
+<!-- BEGIN header -->
+<form method="POST" action="{action_url}">
+<table border="0" align="center">
+ <tr bgcolor="{th_bg}">
+ <td colspan="2"><font color="{th_text}"> <b>{title}</b></font></td>
+ </tr>
+<!-- END header -->
+
+<!-- BEGIN body -->
+ <tr bgcolor="{row_on}">
+ <td colspan="2"> </td>
+ </tr>
+
+ <tr bgcolor="{row_off}">
+ <td colspan="2"><b>{Registration_settings}</b></td>
+ </tr>
+ <tr bgcolor="{row_on}">
+ <td>{lang_ajaxURL}:</td>
+ <td><input name="newsettings[AJAXURL]" value="{value_AJAXURL}"></td>
+ </tr>
+ <tr bgcolor="{row_off}">
+ <td colspan="2"> </td>
+ </tr>
+ <tr bgcolor="{row_on}">
+ <td>{lang_Anonymous_user}:</td>
+ <td><input name="newsettings[anonymous_user]"
value="{value_anonymous_user}"></td>
+ </tr>
+ <tr bgcolor="{row_off}">
+ <td>{lang_Anonymous_password}:</td>
+ <td><input type="password" name="newsettings[anonymous_pass]"
value="{value_anonymous_pass}"></td>
+ </tr>
+ <tr bgcolor="{row_on}">
+
+<!-- END body -->
+
+<!-- BEGIN footer -->
+ <tr bgcolor="{th_bg}">
+ <td colspan="2">
+
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2" align="center">
+ <input type="submit" name="submit" value="{lang_submit}">
+ <input type="submit" name="cancel" value="{lang_cancel}">
+ </td>
+ </tr>
+</table>
+</form>
+<!-- END footer -->
Modified: branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
2012-05-09 12:39:39 UTC (rev 9338)
+++ branches/Version-1_0-branch/controller/inc/class.uicalendar.inc.php
2012-05-09 12:41:33 UTC (rev 9339)
@@ -53,7 +53,6 @@
public $public_functions = array
(
- 'index' => true,
'view_calendar_for_month' =>
true,
'view_calendar_for_year' =>
true,
'view_calendar_year_for_locations' => true,
@@ -64,12 +63,12 @@
{
parent::__construct();
- $read =
$GLOBALS['phpgw']->acl->check('.control', PHPGW_ACL_READ, 'controller');//1
- $add =
$GLOBALS['phpgw']->acl->check('.control', PHPGW_ACL_ADD, 'controller');//2
- $edit =
$GLOBALS['phpgw']->acl->check('.control', PHPGW_ACL_EDIT, 'controller');//4
- $delete = $GLOBALS['phpgw']->acl->check('.control',
PHPGW_ACL_DELETE, 'controller');//8
+ $read = $GLOBALS['phpgw']->acl->check('.control',
PHPGW_ACL_READ, 'controller');//1
+ $add = $GLOBALS['phpgw']->acl->check('.control',
PHPGW_ACL_ADD, 'controller');//2
+ $edit = $GLOBALS['phpgw']->acl->check('.control',
PHPGW_ACL_EDIT, 'controller');//4
+ $delete = $GLOBALS['phpgw']->acl->check('.control',
PHPGW_ACL_DELETE, 'controller');//8
- $manage = $GLOBALS['phpgw']->acl->check('.control',
16, 'controller');//16
+ $manage = $GLOBALS['phpgw']->acl->check('.control',
16, 'controller');//16
$this->so = CreateObject('controller.socheck_list');
$this->so_control =
CreateObject('controller.socontrol');
@@ -103,8 +102,6 @@
$to_date_ts = strtotime("$to_month/01/$to_year");
- $this->calendar_builder = new
calendar_builder($from_date_ts, $to_date_ts);
-
$criteria = array
(
'user_id' =>
$GLOBALS['phpgw_info']['user']['account_id'],
@@ -120,39 +117,37 @@
$location_code =
$my_locations[0]["location_code"];
}
- $num_days_in_month = cal_days_in_month(CAL_GREGORIAN,
$month, $year);
-
// Fetches controls for location within specified time
period
$controls_for_location_array =
$this->so_control->get_controls_by_location($location_code, $from_date_ts,
$to_date_ts);
- // Fetches control ids with check lists for specified
time period
+ // Fetches all control ids with check lists for
specified time period
$control_id_with_check_list_array =
$this->so->get_check_lists_for_location_2($location_code, $from_date_ts,
$to_date_ts);
// Loops through all controls for location and
populates controls with check lists
- $control_with_check_list_array =
$this->populate_controls_with_check_lists($controls_for_location_array,
$control_id_with_check_list_array);
+ $controls_with_check_list_array =
$this->populate_controls_with_check_lists($controls_for_location_array,
$control_id_with_check_list_array);
- $controls_calendar_array =
$this->calendar_builder->build_calendar_array( $control_with_check_list_array,
$num_days_in_month, "view_days" );
+ $controls_calendar_array = array();
+ foreach($controls_with_check_list_array as $control){
+ $month_calendar = new month_calendar($control,
$year, $month);
+ $calendar_array =
$month_calendar->build_calendar( $control->get_check_lists_array() );
+
+ $controls_calendar_array[] = array("control" =>
$control->toArray(), "calendar_array" => $calendar_array);
+ }
$location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
$property_array =
execMethod('property.solocation.read', array('type_id' => 1, 'allrows' =>
true));
-
- $month_array = array("Januar", "Februar", "Mars",
"April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November",
"Desember");
-
- for($i=1;$i<=$num_days_in_month;$i++){
- $heading_array[$i] = "$i";
- }
-
+
$data = array
(
'my_locations' =>
$my_locations,
'view_location_code' => $location_code,
'property_array' =>
$property_array,
'location_array' =>
$location_array,
- 'heading_array' =>
$heading_array,
+ 'heading_array' =>
month_calendar::get_heading_array($year, $month),
'controls_calendar_array' =>
$controls_calendar_array,
'date_format' =>
$date_format,
- 'period' =>
$month_array[ $month - 1],
+ 'period' =>
month_calendar::get_month_name($month-1),
'month_nr' =>
$month,
'year' =>
$year,
);
@@ -396,15 +391,6 @@
$location_finder = new location_finder();
$my_locations = $location_finder->get_responsibilities(
$criteria );
-
-
- $month_array = array("Januar", "Februar", "Mars",
"April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November",
"Desember");
-
- $num_days_in_month = cal_days_in_month(CAL_GREGORIAN,
$month, $year);
-
- for($i=1;$i<=$num_days_in_month;$i++){
- $heading_array[$i] = "$i";
- }
$data = array
(
@@ -412,12 +398,12 @@
'view_location_code' =>
$location_code,
'property_array'
=> $property_array,
'location_array'
=> $location_array,
- 'heading_array'
=> $heading_array,
'locations_with_calendar_array' =>
$locations_with_calendar_array,
'date_format'
=> $date_format,
- 'period'
=> $month_array[ $month - 1],
'month_nr'
=> $month,
'year'
=> $year,
+ 'heading_array'
=> month_calendar::get_heading_array($year, $month),
+ 'period'
=> month_calendar::get_month_name($month-1),
);
self::render_template_xsl(
array('calendar/view_calendar_month_for_locations',
'calendar/check_list_status_checker', 'calendar/icon_color_map'), $data);
Modified: branches/Version-1_0-branch/controller/inc/class.uicase.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicase.inc.php
2012-05-09 12:39:39 UTC (rev 9338)
+++ branches/Version-1_0-branch/controller/inc/class.uicase.inc.php
2012-05-09 12:41:33 UTC (rev 9339)
@@ -353,7 +353,7 @@
$this->so->update( $case );
}
- // Gets first case of cases related to the
message
+ // Gets first case of cases related to the
message
$case = $cases_array[0];
// Gets check_item from case
Modified:
branches/Version-1_0-branch/controller/inc/component/class.month_calendar.inc.php
===================================================================
---
branches/Version-1_0-branch/controller/inc/component/class.month_calendar.inc.php
2012-05-09 12:39:39 UTC (rev 9338)
+++
branches/Version-1_0-branch/controller/inc/component/class.month_calendar.inc.php
2012-05-09 12:41:33 UTC (rev 9339)
@@ -44,9 +44,9 @@
function init_calendar(){
- $this->calendar_array = array();
+ $num_days_in_month = cal_days_in_month(CAL_GREGORIAN,
$this->month, $this->year);
- for($i=1;$i<=$num;$i++){
+ for($i=1;$i<=$num_days_in_month;$i++){
$this->calendar_array[$i] = null;
}
@@ -69,6 +69,24 @@
}
}
+ public static function get_heading_array($year, $month){
+ $num_days_in_month = cal_days_in_month(CAL_GREGORIAN, $month,
$year);
+ $heading_array = array();
+
+ for($i=1;$i<=$num_days_in_month;$i++){
+ $heading_array[$i] = "$i";
+ }
+
+ return $heading_array;
+ }
+
+ public static function get_month_name($month){
+
+ $month_array = array("Januar", "Februar", "Mars", "April",
"Mai", "Juni", "Juli", "August", "September", "Oktober", "November",
"Desember");
+
+ return $month_array[$month];
+ }
+
// Function that puts checklists into a twelve months array for
displaying a year or a days array for displaying a month
public function build_calendar( $check_lists_array ){
Modified:
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month.xsl
2012-05-09 12:39:39 UTC (rev 9338)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month.xsl
2012-05-09 12:41:33 UTC (rev 9339)
@@ -78,13 +78,13 @@
<ul class="calendar month">
<li class="heading">
<div class="control_details_wrp">
- <div class="title">Tittel</div>
- <div
class="assigned">Tildelt</div>
- <div
class="frequency">Frekvens</div>
+ <div
class="title"><span>Tittel</span></div>
+ <div
class="assigned"><span>Tildelt</span></div>
+ <div
class="frequency"><span>Frekvens</span></div>
</div>
<div class="days_wrp">
<xsl:for-each
select="heading_array">
- <div><xsl:value-of
select="."/></div>
+
<div><span><xsl:value-of select="."/></span></div>
</xsl:for-each>
</div>
</li>
@@ -104,14 +104,16 @@
<div class="control_details_wrp">
<div class="title">
- <xsl:value-of
select="control/title"/>
+ <span><xsl:value-of
select="control/title"/></span>
</div>
<div class="assigned">
- <xsl:value-of
select="control/responsibility_name"/>
+ <span><xsl:value-of
select="control/responsibility_name"/></span>
</div>
<div class="frequency">
- <xsl:value-of
select="control/repeat_type_label"/>
- <xsl:value-of
select="control/repeat_interval"/>
+ <span>
+ <xsl:value-of
select="control/repeat_type_label"/>
+ <xsl:value-of
select="control/repeat_interval"/>
+ </span>
</div>
</div>
Modified:
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year.xsl
2012-05-09 12:39:39 UTC (rev 9338)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year.xsl
2012-05-09 12:41:33 UTC (rev 9339)
@@ -48,12 +48,9 @@
<ul class="calendar">
<li class="heading">
<div class="control_details_wrp">
- <xsl:if test="show_location">
- <div
class="location">Lokasjon</div>
- </xsl:if>
- <div class="title">Tittel</div>
- <div class="assigned">Tildelt</div>
- <div class="frequency">Frekvens</div>
+ <div
class="title"><span>Tittel</span></div>
+ <div
class="assigned"><span>Tildelt</span></div>
+ <div
class="frequency"><span>Frekvens</span></div>
</div>
<div class="months_wrp">
<xsl:for-each select="heading_array">
@@ -98,13 +95,13 @@
</div>
</xsl:if>
<div class="title">
- <xsl:value-of
select="control/title"/>
+ <span><xsl:value-of
select="control/title"/></span>
</div>
<div class="assigned">
- <xsl:value-of
select="control/responsibility_name"/>
+ <span><xsl:value-of
select="control/responsibility_name"/></span>
</div>
<div class="frequency">
- <xsl:value-of
select="control/repeat_type_label"/>
+ <span><xsl:value-of
select="control/repeat_type_label"/></span>
</div>
</div>
<div class="months_wrp">
Modified:
branches/Version-1_0-branch/controller/templates/base/case/view_case_message.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/case/view_case_message.xsl
2012-05-09 12:39:39 UTC (rev 9338)
+++
branches/Version-1_0-branch/controller/templates/base/case/view_case_message.xsl
2012-05-09 12:41:33 UTC (rev 9339)
@@ -13,7 +13,7 @@
<h3 class="box_header ext">Melding registrert</h3>
<div id="caseMessage" class="box ext">
- <a id="showMessage">
+ <a id="showMessage" target="_blank">
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=property.uitts.view</xsl:text>
<xsl:text>&id=</xsl:text>
Modified: branches/Version-1_0-branch/controller/templates/base/css/base.css
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/css/base.css
2012-05-09 12:39:39 UTC (rev 9338)
+++ branches/Version-1_0-branch/controller/templates/base/css/base.css
2012-05-09 12:41:33 UTC (rev 9339)
@@ -962,10 +962,6 @@
font-weight: bold;
font-size:15px;
}
-.control_details_wrp div{
- width: 100px;
- float:left;
-}
.days_wrp div {
float: left;
font-size: 13px;
@@ -979,6 +975,10 @@
text-align: center;
width: 40px;
}
+.months_wrp div a, .days_wrp div a, .control_details_wrp span, .days_wrp div
span {
+ display: block;
+ padding: 8px 0;
+}
ul.calendar li {
height: 30px;
padding: 7px 0;
@@ -994,13 +994,11 @@
clear: both;
padding: 1em;
}
-.control_details_wrp div{
- float:left;
-}
.control_details_wrp div {
float: left;
height: 30px;
padding: 0 10px;
+ width: 100px;
}
.control_details_wrp div.title {
width: 200px;
@@ -1039,10 +1037,7 @@
display: block;
font-size: 10px;
font-weight: bold;
- left: 18px;
- position: absolute;
text-decoration: none;
- top: 8px;
}
.days_wrp a.view_info_box {
left: 8px;
Modified: branches/Version-1_0-branch/property/inc/class.sotts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sotts.inc.php
2012-05-09 12:39:39 UTC (rev 9338)
+++ branches/Version-1_0-branch/property/inc/class.sotts.inc.php
2012-05-09 12:41:33 UTC (rev 9339)
@@ -893,7 +893,7 @@
$this->db->query("SELECT closed from
fm_tts_status WHERE id = {$check_new_custom}",__LINE__,__FILE__);
$this->db->next_record();
- if($this->db->f('closed') &&
($old_status!='X' && !$old_closed))
+ if(($this->db->f('closed') ||
$ticket['status'] == 'X') && ($old_status!='X' && !$old_closed))
{
$location_id =
$GLOBALS['phpgw']->locations->get_id('property', '.ticket');
$controller =
CreateObject('controller.uicase');
@@ -1082,7 +1082,7 @@
$this->db->query("SELECT closed from
fm_tts_status WHERE id = {$check_new_custom}",__LINE__,__FILE__);
$this->db->next_record();
- if($this->db->f('closed') &&
($old_status!='X' && !$old_closed))
+ if(($this->db->f('closed') ||
$ticket['status'] == 'X') && ($old_status!='X' && !$old_closed))
{
$location_id =
$GLOBALS['phpgw']->locations->get_id('property', '.ticket');
$controller =
CreateObject('controller.uicase');
Modified: branches/Version-1_0-branch/property/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/tables_current.inc.php
2012-05-09 12:39:39 UTC (rev 9338)
+++ branches/Version-1_0-branch/property/setup/tables_current.inc.php
2012-05-09 12:41:33 UTC (rev 9339)
@@ -1172,7 +1172,7 @@
'fk' => array(),
'uc' => array()
),
- 'fm_ecodimd_role' => array(
+ 'fm_ecodimb_role' => array(
'fd' => array(
'id' => array('type' => 'int','precision' =>
'4','nullable' => False),
'name' => array('type' => 'varchar','precision'
=> '25','nullable' => False)
@@ -1188,9 +1188,9 @@
'ecodimb' => array('type' => 'int','precision'
=> '4','nullable' => False),
'user_id' => array('type' => 'int','precision'
=> '4','nullable' => False),
'role_id' => array('type' => 'int','precision'
=> '4','nullable' => False),
- 'default' => array('type' => 'int','precision'
=> '2','nullable' => true),
- 'active_from' => array('type' => 'int',
'precision' => 4,'nullable' => True),
- 'active_to' => array('type' => 'int',
'precision' => 4,'nullable' => True),
+ 'default_user' => array('type' =>
'int','precision' => '2','nullable' => true, 'default' => 0),
+ 'active_from' => array('type' => 'int',
'precision' => 4,'nullable' => False),
+ 'active_to' => array('type' => 'int',
'precision' => 4,'nullable' => True, 'default' => 0),
'created_on' => array('type' => 'int',
'precision' => 4,'nullable' => False),
'created_by' => array('type' => 'int',
'precision' => 4,'nullable' => False),
'expired_on' => array('type' => 'int',
'precision' => 4,'nullable' => True),
@@ -1198,7 +1198,7 @@
),
'pk' => array('id'),
'ix' => array(),
- 'fk' => array('fm_ecodimd_role' => array('role_id' =>
'id'),'fm_ecodimd' => array('ecodimd' => 'id'),'phpgw_accounts' =>
array('user_id'=>'account_id')),
+ 'fk' => array('fm_ecodimb_role' => array('role_id' =>
'id'),'fm_ecodimb' => array('ecodimb' => 'id'),'phpgw_accounts' =>
array('user_id'=>'account_id')),
'uc' => array()
),
'fm_ecodimd' => array(
Modified: branches/Version-1_0-branch/property/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/tables_update.inc.php
2012-05-09 12:39:39 UTC (rev 9338)
+++ branches/Version-1_0-branch/property/setup/tables_update.inc.php
2012-05-09 12:41:33 UTC (rev 9339)
@@ -6277,9 +6277,9 @@
'ecodimb' => array('type' =>
'int','precision' => '4','nullable' => False),
'user_id' => array('type' =>
'int','precision' => '4','nullable' => False),
'role_id' => array('type' =>
'int','precision' => '4','nullable' => False),
- 'default_user' => array('type' =>
'int','precision' => '2','nullable' => true),
- 'active_from' => array('type' => 'int',
'precision' => 4,'nullable' => True),
- 'active_to' => array('type' => 'int',
'precision' => 4,'nullable' => True),
+ 'default_user' => array('type' =>
'int','precision' => '2','nullable' => true, 'default' => 0),
+ 'active_from' => array('type' => 'int',
'precision' => 4,'nullable' => False),
+ 'active_to' => array('type' => 'int',
'precision' => 4,'nullable' => True, 'default' => 0),
'created_on' => array('type' => 'int',
'precision' => 4,'nullable' => False),
'created_by' => array('type' => 'int',
'precision' => 4,'nullable' => False),
'expired_on' => array('type' => 'int',
'precision' => 4,'nullable' => True),
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9339] Merge 9325:9338 from trunk,
Sigurd Nes <=