[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9892] Merge 9885:9891 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9892] Merge 9885:9891 from trunk |
|
Date: |
Tue, 21 Aug 2012 09:35:46 +0000 |
Revision: 9892
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9892
Author: sigurdne
Date: 2012-08-21 09:35:46 +0000 (Tue, 21 Aug 2012)
Log Message:
-----------
Merge 9885:9891 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/activitycalendar/inc/class.soorganization.inc.php
branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
branches/Version-1_0-branch/activitycalendar/inc/class.uiorganization.inc.php
branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang
branches/Version-1_0-branch/activitycalendar/templates/base/activity_list_partial.php
branches/Version-1_0-branch/activitycalendarfrontend/setup/phpgw_no.lang
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_edit.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/setup/phpgw_no.lang
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858,9860-9863,9865,9867,9869-9871,9873-9884
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858,9860-9863,9865,9867,9869-9871,9873-9884,9886-9891
Modified:
branches/Version-1_0-branch/activitycalendar/inc/class.soorganization.inc.php
===================================================================
---
branches/Version-1_0-branch/activitycalendar/inc/class.soorganization.inc.php
2012-08-21 09:23:47 UTC (rev 9891)
+++
branches/Version-1_0-branch/activitycalendar/inc/class.soorganization.inc.php
2012-08-21 09:35:46 UTC (rev 9892)
@@ -738,7 +738,7 @@
{
$district = '';
}
- $activity_id = $org_info['activity_id'];
+ $activity_id = 1;
$show_in_portal = 1;
$values = array(
@@ -754,7 +754,7 @@
'activity_id = ' . $this->marshal($activity_id, 'int'),
'show_in_portal = 1'
);
-
+
$result = $this->db->query('UPDATE bb_organization SET ' .
join(',', $values) . " WHERE id=$orgid", __LINE__,__FILE__);
}
Modified:
branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
2012-08-21 09:23:47 UTC (rev 9891)
+++ branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
2012-08-21 09:35:46 UTC (rev 9892)
@@ -522,14 +522,16 @@
//$link_text = "<a
href='{$mailBaseURL}?menuaction=activitycalendarfrontend.uiactivity.edit&id={$activity->get_id()}&secret={$activity->get_secret()}'>Rediger
opplysninger for {$activity->get_title()}</a>";
$link_text = "<a
href='http://www.bergen.kommune.no/aktivitetsoversikt/?menuaction=activitycalendarfrontend.uiactivity.edit&id={$activity->get_id()}&secret={$activity->get_secret()}'>Rediger
opplysninger for {$activity->get_title()}</a>";
$office_name =
activitycalendar_soactivity::get_instance()->get_office_name($activity->get_office());
- //$office_footer =
activitycalendar_soactivity::get_instance()->get_office_description($activity->get_office());
+ $uid = $GLOBALS['phpgw_info']['user']['account_id'];
+ $user_office_id =
activitycalendar_soactivity::get_instance()->get_office_from_user($uid);
+ $office_footer =
activitycalendar_soactivity::get_instance()->get_office_description($user_office_id);
if($activity->get_state() == 2)
{
- $body = lang('mail_body_update_frontend',
$activity->get_title(), $link_text, $office_name);// .
'<br/><br/>'.$office_footer;
+ $body = lang('mail_body_update_frontend',
$activity->get_title(), $link_text, $office_name) . '<br/><br/>'.$office_footer;
}
else
{
- $body = lang('mail_body_update',
$activity->get_title(), $link_text, $office_name);// .
'<br/><br/>'.$office_footer;
+ $body = lang('mail_body_update',
$activity->get_title(), $link_text, $office_name) . '<br/><br/>'.$office_footer;
}
//var_dump($subject);
Modified:
branches/Version-1_0-branch/activitycalendar/inc/class.uiorganization.inc.php
===================================================================
---
branches/Version-1_0-branch/activitycalendar/inc/class.uiorganization.inc.php
2012-08-21 09:23:47 UTC (rev 9891)
+++
branches/Version-1_0-branch/activitycalendar/inc/class.uiorganization.inc.php
2012-08-21 09:35:46 UTC (rev 9892)
@@ -176,7 +176,6 @@
else if(isset($_POST['update_organization'])) // The
user has pressed the store button
{
$original_org_id =
phpgw::get_var('original_org_id');
- $org_info['orgid'] = $original_org_id;
$orgno = phpgw::get_var('orgno');
$district = phpgw::get_var('org_district');
$homepage = phpgw::get_var('homepage');
@@ -185,8 +184,6 @@
$address = phpgw::get_var('address');
$zip = phpgw::get_var('zip_code');
$city = phpgw::get_var('city');
- //phpgw::get_var('address') . ' ' .
phpgw::get_var('number') . ', ' . phpgw::get_var('postaddress');
- //$address_array = explode(",",$address_tmp);
$desc = phpgw::get_var('org_description');
$org_info = array();
@@ -207,6 +204,7 @@
$org_info['city'] = $city;
$org_info['activity_id'] = '';
$org_info['district'] = $district;
+ $org_info['orgid'] = $original_org_id;
$contact1_id = phpgw::get_var('contact1_id');
$contact2_id = phpgw::get_var('contact2_id');
Modified: branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang
2012-08-21 09:23:47 UTC (rev 9891)
+++ branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang
2012-08-21 09:35:46 UTC (rev 9892)
@@ -386,7 +386,7 @@
send_mail activitycalendar no Send e-post
marked_as activitycalendar no Status
address_number activitycalendar no Husnummer
-changed_organizations_groups activitycalendar no Endrede
organisasjoner/grupper
+changed_organizations_groups activitycalendar no Endrede
organisasjoner
changed_org_group activitycalendar no Endringer
building activitycalendar no Kommunale bygg
Download as excel activitycalendar no Last ned i Excel-format
Modified:
branches/Version-1_0-branch/activitycalendar/templates/base/activity_list_partial.php
===================================================================
---
branches/Version-1_0-branch/activitycalendar/templates/base/activity_list_partial.php
2012-08-21 09:23:47 UTC (rev 9891)
+++
branches/Version-1_0-branch/activitycalendar/templates/base/activity_list_partial.php
2012-08-21 09:35:46 UTC (rev 9892)
@@ -114,7 +114,7 @@
'index.php?menuaction=activitycalendar.uiactivities.query&phpgw_return_as=json<?php
echo $url_add_on; ?>&editable=<?php echo $editable ? "true" : "false"; ?>',
columnDefs,
'<?php echo $list_id ?>_form',
- ['<?php echo $list_id ?>_ctrl_toggle_activity_state', '<?php
echo $list_id ?>_ctrl_toggle_activity_district', '<?php echo $list_id
?>_ctrl_toggle_activity_category', '<?php echo $list_id ?>_ctrl_search_query',
'date_updated'],
+ ['<?php echo $list_id ?>_ctrl_toggle_activity_state', '<?php
echo $list_id ?>_ctrl_toggle_activity_district', '<?php echo $list_id
?>_ctrl_toggle_activity_category', '<?php echo $list_id ?>_ctrl_search_query',
'date_change'],
'<?php echo $list_id ?>_container',
'<?php echo $list_id ?>_paginator',
'<?php echo $list_id ?>',
@@ -185,6 +185,14 @@
{
$uid = $GLOBALS['phpgw_info']['user']['account_id'];
$user_office =
activitycalendar_soactivity::get_instance()->get_office_from_user($uid);
+ if($user_office && $user_office == 1)
+ {
+ $user_office = 2;
+ }
+ else if($user_office == 2)
+ {
+ $user_office = 1;
+ }
?>
<form id="<?php echo $list_id ?>_form" method="GET">
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/activitycalendarfrontend/setup/phpgw_no.lang
2012-08-21 09:23:47 UTC (rev 9891)
+++ branches/Version-1_0-branch/activitycalendarfrontend/setup/phpgw_no.lang
2012-08-21 09:35:46 UTC (rev 9892)
@@ -114,4 +114,21 @@
contact_person activitycalendarfrontend no Kontaktperson for
aktiviteten
activity_ok_message activitycalendarfrontend no Aktiviteten er
lagret uten endringer
activity_ok activitycalendarfrontend no Opplysningene er
korrekte
-change_activity activitycalendarfrontend no Endre
opplysningene
\ No newline at end of file
+change_activity activitycalendarfrontend no Endre
opplysningene
+help_choose_activity_org activitycalendarfrontend no I
aktivitetsoversikten må en aktivitet alltid tilhøre en organisasjon.\\n\\n
Dersom en organisasjonen er oppført med andre aktiviteter fra før, skal du
velge denne i stedet for å registrere ny. Du kan søke deg frem til din
organisasjon ved å skrive i feltet.\\n\\nDersom organisasjon ikke er registrert
tidligere velger du «Registrer ny organisasjon.\\n\\nDersom det ikke er et
skarpt skille mellom organisasjon og aktivitet, skal du likevel velge
organisasjon/registrere ny organisasjon. Det gjør ingen ting om enkelte
opplysninger, som f.eks. kontaktinformasjon, skrives inn to ganger.
+help_organization_name activitycalendarfrontend no Skriv inn
organisasjonens navn her.
+help_new_activity_org activitycalendarfrontend no I
aktivitetsoversikten må en aktivitet alltid tilhøre en organisasjon.
\\n\\nDersom det ikke er et skarpt skille mellom organisasjon og aktivitet,
skal du likevel skrive inn navn i feltet for organisasjonsnavn. Det gjør ingen
ting om navnet på organisasjonen er det samme som navnet på aktiviteten.
+help_streetaddress activitycalendarfrontend no For å unngå
feil innskriving av gateadresse, er feltet for «Gateadresse» koplet mot
kommunens gateregister med oversikt over alle gatenavn i Bergen. Begynn å fylle
ut feltet og velg rett gatenavn som løsningen foreslår.
+help_homepage activitycalendarfrontend no Dersom
organisasjonen/aktiviteten har egen internettside, så kan du skrive den inn her.
+help_contact_person activitycalendarfrontend no Skriv inn navn,
telefonnummer og e-postadresse til kontaktperson for
organisasjonen.\\n\\nDersom organisasjon og aktivitet har samme kontaktperson,
skal du likevel skrive inn kontaktopplysninger. Det gjør ingen ting om disse
opplysningene senere også skrives inn på aktiviteten.\\n\\nI
aktivitetsoversikten på kommunens internettsider, er det opplysningene skrevet
inn på kontaktperson for aktiviteten som vil vises, ikke kontaktperson for
organisasjonen.
+help_new_activity_title activitycalendarfrontend no Skriv
inn navnet på aktiviteten.
+help_new_activity_description activitycalendarfrontend no Gi en
KORT beskrivelse av hva aktiviteten går ut på. Skriv helst kun én setning,
maksimalt to.
+help_new_activity_category activitycalendarfrontend no Velg
den kategorien som passer best for din aktivitet.
+help_new_activity_target activitycalendarfrontend no Velg en
eller flere målgrupper.
+help_new_activity_spec_adapt activitycalendarfrontend no Hak av
dersom aktiviteten passer for utviklingshemmede.
+help_new_activity_location activitycalendarfrontend no Du må
spesifisere hvor aktiviteten foregår.\\n\\nListen er sortert i «Kommunale bygg»
og «Eksterne bygg», dvs. bygg som brukere av løsningen har registrert
tidligere. \\n\\nVelg eksisterende lokale eller registrer nytt, dersom det ikke
finnes i listen.
+help_new_activity_district activitycalendarfrontend no Velg
bydelen hvor aktiviteten foregår.
+help_new_activity_time activitycalendarfrontend no Skriv inn dag
og klokkeslett når aktiviteten foregår, f.eks. slik «Mandag kl. 20 – 21» eller
slik «Hver andre tirsdag kl. 19 – 21».
+help_new_activity_contact_person activitycalendarfrontend no
Skriv inn navn, telefonnummer og e-postadresse til kontaktperson for
aktiviteten.
+help_new_activity_office activitycalendarfrontend no Det
kommunale kulturkontoret mottar registreringen. Velg kulturkontoret i den
bydelen hvor aktiviteten foregår.
+help_edit_activity_location activitycalendarfrontend no Du må
spesifisere hvor aktiviteten foregår.\\n\\nListen er sortert i «Kommunale bygg»
og «Eksterne bygg», dvs. bygg som brukere av løsningen har registrert tidligere.
\ No newline at end of file
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_edit.php
===================================================================
---
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_edit.php
2012-08-21 09:23:47 UTC (rev 9891)
+++
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_edit.php
2012-08-21 09:35:46 UTC (rev 9892)
@@ -232,25 +232,16 @@
<fieldset title="<?php echo lang('what')?>">
<legend>Hva</legend>
<dt>
- <label for="title"><?php echo
lang('activity_title') ?> (*) <A
onclick="window.open('hjelp.html','name','height=255,
width=350,toolbar=no,directories=no,status=no,
menubar=no,scrollbars=no,resizable=no'); return false;"
-
href="http://dl-web.dropbox.com/u/44022695/Aktivitetsoversikt/hjelp.html";
- target="name"><IMG alt="Hjelp"
-
src="/aktivitetsoversikt/images/hjelp.gif"></A></label>
+ <label for="title"><?php echo
lang('activity_title') ?> (*) <a onclick="alert('<?php echo
lang('help_new_activity_title')?>'); return false;" href="#"><img alt="Hjelp"
src="/aktivitetsoversikt/images/hjelp.gif"></a></label>
</dt>
<dd>
<input type="text" name="title"
id="title" value="<?php echo $activity->get_title() ?>" size="83"/>
</dd>
<DT>
- <LABEL for="org_description"><?php echo
lang('description')?> (*) <A
onclick="window.open('hjelp.html','name','height=255,
width=350,toolbar=no,directories=no,status=no,
menubar=no,scrollbars=no,resizable=no'); return false;"
-
href="http://dl-web.dropbox.com/u/44022695/Aktivitetsoversikt/hjelp.html";
- target="name"><IMG alt="Hjelp"
-
src="/aktivitetsoversikt/images/hjelp.gif"></A></LABEL></DT>
+ <LABEL for="org_description"><?php echo
lang('description')?> (*) <a onclick="alert('<?php echo
lang('help_new_activity_description')?>'); return false;" href="#"><img
alt="Hjelp" src="/aktivitetsoversikt/images/hjelp.gif"></a></LABEL></DT>
<DD><TEXTAREA cols="80" rows="4" name="description"
id="description"><?php echo $activity->get_description() ?></TEXTAREA></DD>
<dt>
- <label for="category"><?php echo
lang('category') ?> (*) <A
onclick="window.open('hjelp.html','name','height=255,
width=350,toolbar=no,directories=no,status=no,
menubar=no,scrollbars=no,resizable=no'); return false;"
-
href="http://dl-web.dropbox.com/u/44022695/Aktivitetsoversikt/hjelp.html";
- target="name"><IMG alt="Hjelp"
-
src="/aktivitetsoversikt/images/hjelp.gif"></A></label>
+ <label for="category"><?php echo
lang('category') ?> (*) <a onclick="alert('<?php echo
lang('help_new_activity_category')?>'); return false;" href="#"><img
alt="Hjelp" src="/aktivitetsoversikt/images/hjelp.gif"></a></label>
</dt>
<dd>
<?php
@@ -269,10 +260,7 @@
</fieldset>
<fieldset id="hvem"><legend>For hvem</legend>
<dt>
- <label for="target"><?php echo
lang('target') ?> (*) <A onclick="window.open('hjelp.html','name','height=255,
width=350,toolbar=no,directories=no,status=no,
menubar=no,scrollbars=no,resizable=no'); return false;"
-
href="http://dl-web.dropbox.com/u/44022695/Aktivitetsoversikt/hjelp.html";
- target="name"><IMG alt="Hjelp"
- src="/aktivitetsoversikt/images/hjelp.gif"></A>
+ <label for="target"><?php echo
lang('target') ?> (*) <a onclick="alert('<?php echo
lang('help_new_activity_target')?>'); return false;" href="#"><img alt="Hjelp"
src="/aktivitetsoversikt/images/hjelp.gif"></a>
</label>
</dt>
<dd>
@@ -290,20 +278,14 @@
<dt>
<input type="checkbox"
name="special_adaptation" id="special_adaptation" <?php echo
$activity->get_special_adaptation() ? ' checked="checked"' : '' ?>/>
<label for="special_adaptation"><?php
echo lang('special_adaptation') ?></label>
- <A
onclick="window.open('hjelp.html','name','height=255,
width=350,toolbar=no,directories=no,status=no,
menubar=no,scrollbars=no,resizable=no'); return false;"
-
href="http://dl-web.dropbox.com/u/44022695/Aktivitetsoversikt/hjelp.html";
- target="name"><IMG alt="Hjelp"
- src="/aktivitetsoversikt/images/hjelp.gif"></A>
+ <a onclick="alert('<?php echo
lang('help_new_activity_spec_adapt')?>'); return false;" href="#"><img
alt="Hjelp" src="/aktivitetsoversikt/images/hjelp.gif"></a>
</dt>
</fieldset>
<fieldset title="hvor">
<LEGEND>Hvor og når</LEGEND>
<dt>
<br/>
- <label for="arena"><?php echo
lang('arena') ?> (*) <A onclick="window.open('hjelp.html','name','height=255,
width=350,toolbar=no,directories=no,status=no,
menubar=no,scrollbars=no,resizable=no'); return false;"
-
href="http://dl-web.dropbox.com/u/44022695/Aktivitetsoversikt/hjelp.html";
- target="name"><IMG alt="Hjelp"
- src="/aktivitetsoversikt/images/hjelp.gif"></A>
+ <label for="arena"><?php echo
lang('arena') ?> (*) <a onclick="alert('<?php echo
lang('help_edit_activity_location')?>'); return false;" href="#"><img
alt="Hjelp" src="/aktivitetsoversikt/images/hjelp.gif"></a>
</label>
<br/>
</dt>
@@ -342,10 +324,7 @@
<BR>
</dd>
<dt>
- <label for="district"><?php echo
lang('district') ?> (*) <A
onclick="window.open('hjelp.html','name','height=255,
width=350,toolbar=no,directories=no,status=no,
menubar=no,scrollbars=no,resizable=no'); return false;"
-
href="http://dl-web.dropbox.com/u/44022695/Aktivitetsoversikt/hjelp.html";
- target="name"><IMG alt="Hjelp"
- src="/aktivitetsoversikt/images/hjelp.gif"></A>
+ <label for="district"><?php echo
lang('district') ?> (*) <a onclick="alert('<?php echo
lang('help_new_activity_district')?>'); return false;" href="#"><img
alt="Hjelp" src="/aktivitetsoversikt/images/hjelp.gif"></a>
</label>
</dt>
<dd>
@@ -361,10 +340,7 @@
?>
</dd>
<dt>
- <label for="time"><?php echo
lang('time') ?> (*) <A onclick="window.open('hjelp.html','name','height=255,
width=350,toolbar=no,directories=no,status=no,
menubar=no,scrollbars=no,resizable=no'); return false;"
-
href="http://dl-web.dropbox.com/u/44022695/Aktivitetsoversikt/hjelp.html";
- target="name"><IMG alt="Hjelp"
-
src="/aktivitetsoversikt/images/hjelp.gif"></A>
+ <label for="time"><?php echo
lang('time') ?> (*) <a onclick="alert('<?php echo
lang('help_new_activity_time')?>'); return false;" href="#"><img alt="Hjelp"
src="/aktivitetsoversikt/images/hjelp.gif"></a>
</label>
</dt>
<dd>
@@ -373,9 +349,7 @@
</fieldset>
<FIELDSET id="arr">
<LEGEND>Kontaktperson</LEGEND><BR>
- Kontaktperson for aktiviteten <A
onclick="window.open('hjelp.html','name','height=255,
width=350,toolbar=no,directories=no,status=no,
menubar=no,scrollbars=no,resizable=no'); return false;"
-
href="http://dl-web.dropbox.com/u/44022695/Aktivitetsoversikt/hjelp.html";
- target="name"><IMG alt="Hjelp"
src="/aktivitetsoversikt/images/hjelp.gif"></A><BR>
+ Kontaktperson for aktiviteten <a
onclick="alert('<?php echo lang('help_new_activity_contact_person')?>'); return
false;" href="#"><img alt="Hjelp"
src="/aktivitetsoversikt/images/hjelp.gif"></a><BR>
<DT><LABEL for="contact_name">Navn
(*)</LABEL></DT>
<DD><INPUT name="contact_name" id="contact_name"
size="80" type="text" value="<?php echo $contact1->get_name()?>"></DD>
<DT><LABEL for="contact_phone">Telefon (*)</LABEL></DT>
@@ -387,11 +361,7 @@
</FIELDSET>
<FIELDSET>
<BR>
- <DT><LABEL for="office">Hvilket kulturkontor skal motta
registreringen (*) <A
- onclick="window.open('hjelp.html','name','height=255,
width=350,toolbar=no,directories=no,status=no,
menubar=no,scrollbars=no,resizable=no'); return false;"
-
href="http://dl-web.dropbox.com/u/44022695/Aktivitetsoversikt/hjelp.html";
- target="name"><IMG alt="Hjelp"
-
src="/aktivitetsoversikt/images/hjelp.gif"></A></LABEL></DT>
+ <DT><LABEL for="office">Hvilket kulturkontor skal motta
registreringen (*) <a onclick="alert('<?php echo
lang('help_new_activity_office')?>'); return false;" href="#"><img alt="Hjelp"
src="/aktivitetsoversikt/images/hjelp.gif"></a></LABEL></DT>
<dd>
<?php
$selected_office =
$activity->get_office();
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_new.php
===================================================================
---
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_new.php
2012-08-21 09:23:47 UTC (rev 9891)
+++
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_new.php
2012-08-21 09:35:46 UTC (rev 9892)
@@ -266,24 +266,15 @@
<fieldset title="<?php echo lang('what')?>">
<legend>Hva</legend>
<dt>
- <label for="title"><?php echo
lang('activity_title') ?> (*) <A
onclick="window.open('hjelp.html','name','height=255,
width=350,toolbar=no,directories=no,status=no,
menubar=no,scrollbars=no,resizable=no'); return false;"
- href="http://dl-web.dropbox.com/u/44022695/Aktivitetsoversikt/hjelp.html";
- target="name"><IMG alt="Hjelp"
- src="/aktivitetsoversikt/images/hjelp.gif"></A></label>
+ <label for="title"><?php echo
lang('activity_title') ?> (*) <a onclick="alert('<?php echo
lang('help_new_activity_title')?>'); return false;" href="#"><img alt="Hjelp"
src="/aktivitetsoversikt/images/hjelp.gif"></a></label>
</dt>
<dd>
<input type="text" name="title"
id="title" value="<?php echo $activity->get_title() ?>" size="83"/>
</dd>
- <DT><LABEL for="org_description"><?php echo
lang('description')?> (*) <A
onclick="window.open('hjelp.html','name','height=255,
width=350,toolbar=no,directories=no,status=no,
menubar=no,scrollbars=no,resizable=no'); return false;"
-
href="http://dl-web.dropbox.com/u/44022695/Aktivitetsoversikt/hjelp.html";
- target="name"><IMG alt="Hjelp"
-
src="/aktivitetsoversikt/images/hjelp.gif"></A></LABEL></DT>
+ <DT><LABEL for="org_description"><?php echo
lang('description')?> (*) <a onclick="alert('<?php echo
lang('help_new_activity_description')?>'); return false;" href="#"><img
alt="Hjelp" src="/aktivitetsoversikt/images/hjelp.gif"></a></LABEL></DT>
<DD><TEXTAREA cols="80" rows="4" name="description"
id="description"></TEXTAREA></DD>
<dt>
- <label for="category"><?php echo
lang('category') ?> (*) <A
onclick="window.open('hjelp.html','name','height=255,
width=350,toolbar=no,directories=no,status=no,
menubar=no,scrollbars=no,resizable=no'); return false;"
-
href="http://dl-web.dropbox.com/u/44022695/Aktivitetsoversikt/hjelp.html";
- target="name"><IMG alt="Hjelp"
-
src="/aktivitetsoversikt/images/hjelp.gif"></A></label>
+ <label for="category"><?php echo
lang('category') ?> (*) <a onclick="alert('<?php echo
lang('help_new_activity_category')?>'); return false;" href="#"><img
alt="Hjelp" src="/aktivitetsoversikt/images/hjelp.gif"></a></label>
</dt>
<dd>
<?php
@@ -302,10 +293,7 @@
</fieldset>
<fieldset id="hvem"><legend>For hvem</legend>
<dt>
- <label for="target"><?php echo
lang('target') ?> (*) <A onclick="window.open('hjelp.html','name','height=255,
width=350,toolbar=no,directories=no,status=no,
menubar=no,scrollbars=no,resizable=no'); return false;"
-
href="http://dl-web.dropbox.com/u/44022695/Aktivitetsoversikt/hjelp.html";
- target="name"><IMG alt="Hjelp"
- src="/aktivitetsoversikt/images/hjelp.gif"></A>
+ <label for="target"><?php echo
lang('target') ?> (*) <a onclick="alert('<?php echo
lang('help_new_activity_target')?>'); return false;" href="#"><img alt="Hjelp"
src="/aktivitetsoversikt/images/hjelp.gif"></a>
</label>
</dt>
<dd>
@@ -323,20 +311,14 @@
<dt>
<input type="checkbox"
name="special_adaptation" id="special_adaptation" />
<label for="special_adaptation"><?php
echo lang('special_adaptation') ?></label>
- <A
onclick="window.open('hjelp.html','name','height=255,
width=350,toolbar=no,directories=no,status=no,
menubar=no,scrollbars=no,resizable=no'); return false;"
-
href="http://dl-web.dropbox.com/u/44022695/Aktivitetsoversikt/hjelp.html";
- target="name"><IMG alt="Hjelp"
- src="/aktivitetsoversikt/images/hjelp.gif"></A>
+ <a onclick="alert('<?php echo
lang('help_new_activity_spec_adapt')?>'); return false;" href="#"><img
alt="Hjelp" src="/aktivitetsoversikt/images/hjelp.gif"></a>
</dt>
</fieldset>
<fieldset title="hvor">
<LEGEND>Hvor og når</LEGEND>
<dt>
<br/>
- <label for="arena"><?php echo
lang('location') ?> (*) <A
onclick="window.open('hjelp.html','name','height=255,
width=350,toolbar=no,directories=no,status=no,
menubar=no,scrollbars=no,resizable=no'); return false;"
-
href="http://dl-web.dropbox.com/u/44022695/Aktivitetsoversikt/hjelp.html";
- target="name"><IMG alt="Hjelp"
- src="/aktivitetsoversikt/images/hjelp.gif"></A>
+ <label for="arena"><?php echo
lang('location') ?> (*) <a onclick="alert('<?php echo
lang('help_new_activity_location')?>'); return false;" href="#"><img
alt="Hjelp" src="/aktivitetsoversikt/images/hjelp.gif"></a>
</label>
</dt>
<dd>
@@ -400,10 +382,7 @@
</DIV>
<dt>
<br/>
- <label for="district"><?php echo
lang('district') ?> (*) <A
onclick="window.open('hjelp.html','name','height=255,
width=350,toolbar=no,directories=no,status=no,
menubar=no,scrollbars=no,resizable=no'); return false;"
-
href="http://dl-web.dropbox.com/u/44022695/Aktivitetsoversikt/hjelp.html";
- target="name"><IMG alt="Hjelp"
- src="/aktivitetsoversikt/images/hjelp.gif"></A>
+ <label for="district"><?php echo
lang('district') ?> (*) <a onclick="alert('<?php echo
lang('help_new_activity_district')?>'); return false;" href="#"><img
alt="Hjelp" src="/aktivitetsoversikt/images/hjelp.gif"></a>
</label>
</dt>
<dd>
@@ -418,19 +397,14 @@
</dd>
<dt>
<br/>
- <label for="time"><?php echo
lang('time') ?> (*) <A onclick="window.open('hjelp.html','name','height=255,
width=350,toolbar=no,directories=no,status=no,
menubar=no,scrollbars=no,resizable=no'); return false;"
-
href="http://dl-web.dropbox.com/u/44022695/Aktivitetsoversikt/hjelp.html";
- target="name"><IMG alt="Hjelp"
- src="/aktivitetsoversikt/images/hjelp.gif"></A></label>
+ <label for="time"><?php echo
lang('time') ?> (*) <a onclick="alert('<?php echo
lang('help_new_activity_time')?>'); return false;" href="#"><img alt="Hjelp"
src="/aktivitetsoversikt/images/hjelp.gif"></a></label>
</dt>
<dd>
<input type="text" name="time"
id="time" value="<?php echo $activity->get_time() ?>" size="80" />
</dd>
</fieldset>
<FIELDSET
id="arr"><LEGEND>Kontaktperson</LEGEND><BR>
- Kontaktperson for aktiviteten <A
onclick="window.open('hjelp.html','name','height=255,
width=350,toolbar=no,directories=no,status=no,
menubar=no,scrollbars=no,resizable=no'); return false;"
-
href="http://dl-web.dropbox.com/u/44022695/Aktivitetsoversikt/hjelp.html";
- target="name"><IMG alt="Hjelp"
src="/aktivitetsoversikt/images/hjelp.gif"></A><BR>
+ Kontaktperson for aktiviteten <a
onclick="alert('<?php echo lang('help_new_activity_contact_person')?>'); return
false;" href="#"><img alt="Hjelp"
src="/aktivitetsoversikt/images/hjelp.gif"></a><BR>
<DT><LABEL for="contact_name">Navn (*)</LABEL></DT>
<DD><INPUT name="contact_name" id="contact_name" size="80"
type="text"></DD>
<DT><LABEL for="contact_phone">Telefon (*)</LABEL></DT>
@@ -442,11 +416,7 @@
</FIELDSET>
<FIELDSET>
<BR>
- <DT><LABEL for="office">Hvilket kulturkontor skal motta
registreringen (*) <A
- onclick="window.open('hjelp.html','name','height=255,
width=350,toolbar=no,directories=no,status=no,
menubar=no,scrollbars=no,resizable=no'); return false;"
-
href="http://dl-web.dropbox.com/u/44022695/Aktivitetsoversikt/hjelp.html";
- target="name"><IMG alt="Hjelp"
-
src="/aktivitetsoversikt/images/hjelp.gif"></A></LABEL></DT>
+ <DT><LABEL for="office">Hvilket kulturkontor skal motta
registreringen (*) <a onclick="alert('<?php echo
lang('help_new_activity_office')?>'); return false;" href="#"><img alt="Hjelp"
src="/aktivitetsoversikt/images/hjelp.gif"></a></LABEL></DT>
<dd>
<?php
$selected_office =
$activity->get_office();
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-08-21 09:23:47 UTC (rev 9891)
+++
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/activity_new_step_1.php
2012-08-21 09:35:46 UTC (rev 9892)
@@ -184,7 +184,7 @@
<label for="organization_id">
<?php echo lang('choose_org')?>
</label>
- <a
onclick="window.open('hjelp.html','name','height=255,
width=350,toolbar=no,directories=no,status=no,
menubar=no,scrollbars=no,resizable=no'); return false;"
href="http://dl-web.dropbox.com/u/44022695/Aktivitetsoversikt/hjelp.html";
target="name"><img alt="Hjelp" src="/aktivitetsoversikt/images/hjelp.gif"></a>
+ <a onclick='alert("<?php echo
lang('help_choose_activity_org')?>"); return false;' href="#"><img alt="Hjelp"
src="/aktivitetsoversikt/images/hjelp.gif"></a>
</dt>
<dd>
<select name="organization_id"
id="organization_id">
@@ -204,24 +204,18 @@
<DIV style="overflow: hidden" id="toggleText3">
<dl>
<DIV style="overflow: hidden;">
- <P>Registrer ny organisasjon <A
onclick="window.open('hjelp.html','name','height=255,
width=350,toolbar=no,directories=no,status=no,
menubar=no,scrollbars=no,resizable=no'); return false;"
-
href="http://dl-web.dropbox.com/u/44022695/Aktivitetsoversikt/hjelp.html";
- target="name"><IMG
alt="Hjelp" src="/aktivitetsoversikt/images/hjelp.gif"></A>
+ <P>Registrer ny organisasjon <a
onclick='alert("<?php echo lang('help_new_activity_org')?>"); return false;'
href="#"><img alt="Hjelp" src="/aktivitetsoversikt/images/hjelp.gif"></a>
</P>
Felt merket med (*) er påkrevde
felt <BR/><BR/>
<dt><label
for="orgname">Organisasjonsnavn (*)</label>
- <A
onclick="window.open('hjelp.html','name','height=255,
width=350,toolbar=no,directories=no,status=no,
menubar=no,scrollbars=no,resizable=no'); return false;"
-
href="http://dl-web.dropbox.com/u/44022695/Aktivitetsoversikt/hjelp.html";
- target="name"><IMG
alt="Hjelp" src="/aktivitetsoversikt/images/hjelp.gif"></A>
+ <a onclick="alert('<?php echo
lang('help_organization_name')?>'); return false;" href="#"><img alt="Hjelp"
src="/aktivitetsoversikt/images/hjelp.gif"></a>
</dt>
<dd><input type="text"
name="orgname" id="orgname" size="80"/></dd>
<dt><label
for="orgno">Organisasjonsnummer</label></dt>
<dd><input type="text"
name="orgno"/></dd>
- <DT style="margin-right: 20px;
float: left;"><label for="street">Gateadresse</label>
- <A
onclick="window.open('hjelp.html','name','height=255,
width=350,toolbar=no,directories=no,status=no,
menubar=no,scrollbars=no,resizable=no'); return false;"
-
href="http://dl-web.dropbox.com/u/44022695/Aktivitetsoversikt/hjelp.html";
-
target="name"><IMG alt="Hjelp"
src="/aktivitetsoversikt/images/hjelp.gif"></A><BR/>
+ <DT style="margin-right: 20px;
float: left;"><label for="street">Gateadresse
+ <a
onclick="alert('<?php echo lang('help_streetaddress')?>'); return false;"
href="#"><img alt="Hjelp"
src="/aktivitetsoversikt/images/hjelp.gif"></a></label><br/>
<INPUT id="address"
onkeyup="javascript:get_address_search()" name="address" size="50"
type="text"><BR/>
<DIV
id="address_container"></DIV>
</DT>
@@ -235,13 +229,11 @@
<INPUT name="postaddress" size="40" type="text">
</DT><BR><BR>
</DIV>
- <DT><LABEL for="homepage">Hjemmeside <A
onclick="window.open('hjelp.html','name','height=255,
width=350,toolbar=no,directories=no,status=no,
menubar=no,scrollbars=no,resizable=no'); return false;"
href="http://dl-web.dropbox.com/u/44022695/Aktivitetsoversikt/hjelp.html";
target="name">
- <IMG alt="Hjelp"
src="/aktivitetsoversikt/images/hjelp.gif"></A></LABEL>
+ <DT><LABEL for="homepage">Hjemmeside <a
onclick="alert('<?php echo lang('help_homepage')?>'); return false;"
href="#"><img alt="Hjelp"
src="/aktivitetsoversikt/images/hjelp.gif"></a></LABEL>
</DT>
<DD><INPUT name="homepage" value="http://"; size="80"
type="text"></DD><BR/><BR/>
<DIV style="overflow: hidden;">
- Kontaktperson for organisasjonen <A
onclick="window.open('hjelp.html','name','height=255,
width=350,toolbar=no,directories=no,status=no,
menubar=no,scrollbars=no,resizable=no'); return false;"
href="http://dl-web.dropbox.com/u/44022695/Aktivitetsoversikt/hjelp.html";
target="name">
- <IMG alt="Hjelp"
src="/aktivitetsoversikt/images/hjelp.gif"></A><BR/>
+ Kontaktperson for organisasjonen <a
onclick="alert('<?php echo lang('help_contact_person')?>'); return false;"
href="#"><img alt="Hjelp" src="/aktivitetsoversikt/images/hjelp.gif"></a><BR/>
<DT><LABEL for="contact1_name">Navn (*)</LABEL></DT>
<DD><INPUT name="org_contact1_name"
id="org_contact1_name" size="80" type="text"></DD>
<DT><LABEL for="contact1_phone">Telefon
(*)</LABEL></DT>
Modified: branches/Version-1_0-branch/controller/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/controller/setup/phpgw_no.lang 2012-08-21
09:23:47 UTC (rev 9891)
+++ branches/Version-1_0-branch/controller/setup/phpgw_no.lang 2012-08-21
09:35:46 UTC (rev 9892)
@@ -358,4 +358,5 @@
error_msg_6 controller no Kontrollen må være knyttet mot en
komponent/lokasjon
error_msg_7 controller no Vennligst endre status for kontroll
eller angi planlagtdato
error_msg_no_controls_in_period controller no Ingen
kontroller for bygg i denne perioden
-error_msg_no_controls_for_component controller no Ingen
kontroller for komponent i denne perioden
\ No newline at end of file
+error_msg_no_controls_for_component controller no Ingen
kontroller for komponent i denne perioden
+role at location controller no Tildeling av rolle
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9892] Merge 9885:9891 from trunk,
Sigurd Nes <=