[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9403] Merge 9397:9402 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9403] Merge 9397:9402 from trunk |
|
Date: |
Tue, 15 May 2012 07:17:03 +0000 |
Revision: 9403
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9403
Author: sigurdne
Date: 2012-05-15 07:17:03 +0000 (Tue, 15 May 2012)
Log Message:
-----------
Merge 9397:9402 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
branches/Version-1_0-branch/activitycalendarfrontend/setup/phpgw_no.lang
branches/Version-1_0-branch/controller/inc/class.uicontrol_location.inc.php
branches/Version-1_0-branch/controller/js/controller/ajax.js
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/calendar/view_calendar_year_for_locations.xsl
branches/Version-1_0-branch/controller/templates/base/css/base.css
branches/Version-1_0-branch/registration/js/portico/ajax.js
Added Paths:
-----------
branches/Version-1_0-branch/controller/images/left_arrow_simple_light_blue.png
branches/Version-1_0-branch/controller/images/right_arrow_simple_light_blue.png
Removed Paths:
-------------
branches/Version-1_0-branch/controller/js/yahoo/control_tabs_rubbish.js
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
+
/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
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-15 07:14:06 UTC (rev 9402)
+++ branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
2012-05-15 07:17:03 UTC (rev 9403)
@@ -422,12 +422,18 @@
function send_email_to_selection($activities)
{
+ $c = createobject('phpgwapi.config','activitycalendarfrontend');
+ $c->read();
+ $config = $c->config_data;
+
+ $mailBaseURL = $c->config_data['mailBaseURL'];
foreach($activities as $activity)
{
//$activity =
activitycalendar_soactivity::get_instance()->get_single($activity_id);
$subject = lang('mail_subject_update');
//$link_text = "<a
href='http://www.bergen.kommune.no/aktivby/registreringsskjema/ny/?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/registreringsskjema/endre/?menuaction=activitycalendarfrontend.uiactivity.edit&id={$activity->get_id()}&secret={$activity->get_secret()}'>Rediger
opplysninger for {$activity->get_title()}</a>";
+ //$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());
if($activity->get_state() == 2)
{
@@ -466,6 +472,11 @@
public function send_mail()
{
+ $c = createobject('phpgwapi.config','activitycalendarfrontend');
+ $c->read();
+ $config = $c->config_data;
+
+ $mailBaseURL = $c->config_data['mailBaseURL'];
$activity_id = (int)phpgw::get_var('activity_id');
$activity =
activitycalendar_soactivity::get_instance()->get_single($activity_id);
@@ -475,7 +486,9 @@
//$subject = lang('mail_subject_update', $avtivity->get_id() .
'-' . $activity->get_title(), $activity->get_link());
$subject = lang('mail_subject_update');
//$link_text =
"http://www.bergen.kommune.no/aktivby/registreringsskjema/ny/?menuaction=activitycalendarfrontend.uiactivity.edit&id={$activity->get_id()}&secret={$activity->get_secret()}";
- $link_text =
"http://www.bergen.kommune.no/aktivitetsoversikt/registreringsskjema/endre/?menuaction=activitycalendarfrontend.uiactivity.edit&id={$activity->get_id()}&secret={$activity->get_secret()}";
+ //$link_text =
"{$mailBaseURL}?menuaction=activitycalendarfrontend.uiactivity.edit&id={$activity->get_id()}&secret={$activity->get_secret()}";
+ //$link_text =
"http://www.bergen.kommune.no/aktivitetsoversikt/?menuaction=activitycalendarfrontend.uiactivity.edit&id={$activity->get_id()}&secret={$activity->get_secret()}";
+ $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());
$body = lang('mail_body_update', $activity->get_title(),
$link_text, $office_name);
}
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/activitycalendarfrontend/setup/phpgw_no.lang
2012-05-15 07:14:06 UTC (rev 9402)
+++ branches/Version-1_0-branch/activitycalendarfrontend/setup/phpgw_no.lang
2012-05-15 07:17:03 UTC (rev 9403)
@@ -98,4 +98,8 @@
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.
-required_fields activitycalendarfrontend no Felter merket
med (*) er påkrevde felt.
\ No newline at end of file
+required_fields activitycalendarfrontend no Felter merket
med (*) er påkrevde felt.
+mailBaseURL activitycalendarfrontend no Base-URL for e-post
+ajaxURL activitycalendarfrontend no URL for AJAX-kall
+Anonymous_user activitycalendarfrontend no Brukernavn for frontend
+Anonymous_password activitycalendarfrontend no Passord for
frontend
\ No newline at end of file
Copied:
branches/Version-1_0-branch/controller/images/left_arrow_simple_light_blue.png
(from rev 9402, trunk/controller/images/left_arrow_simple_light_blue.png)
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/controller/images/right_arrow_simple_light_blue.png
(from rev 9402, trunk/controller/images/right_arrow_simple_light_blue.png)
===================================================================
(Binary files differ)
Modified:
branches/Version-1_0-branch/controller/inc/class.uicontrol_location.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicontrol_location.inc.php
2012-05-15 07:14:06 UTC (rev 9402)
+++ branches/Version-1_0-branch/controller/inc/class.uicontrol_location.inc.php
2012-05-15 07:17:03 UTC (rev 9403)
@@ -58,12 +58,12 @@
var $public_functions = array(
'index' => true,
-
'view_locations_for_control' => true,
-
'register_control_to_location' => true,
-
'register_control_to_location_2' => true,
-
'get_locations_for_control' => true,
-
'get_location_category' => true,
-
'get_district_part_of_town' => true
+
'view_locations_for_control' => true,
+
'register_control_to_location' => true,
+
'register_control_to_location_2' => true,
+
'get_locations_for_control' => true,
+
'get_location_category' => true,
+
'get_district_part_of_town' => true
);
function __construct()
@@ -175,7 +175,6 @@
phpgwapi_yui::load_widget('paginator');
- //self::add_javascript('controller', 'yahoo',
'control_tabs.js'); Slett hvis ikke systemet påvirkes. Mulig denne ikke har
noen funksjon
self::add_javascript('controller', 'controller',
'jquery.js');
self::add_javascript('controller', 'controller',
'ajax.js');
@@ -350,7 +349,6 @@
phpgwapi_yui::load_widget('paginator');
- //self::add_javascript('controller', 'yahoo',
'control_tabs.js'); Slett hvis ikke systemet påvirkes. Mulig denne ikke har
noen funksjon
self::add_javascript('controller',
'controller', 'jquery.js');
self::add_javascript('controller',
'controller', 'ajax.js');
Modified: branches/Version-1_0-branch/controller/js/controller/ajax.js
===================================================================
--- branches/Version-1_0-branch/controller/js/controller/ajax.js
2012-05-15 07:14:06 UTC (rev 9402)
+++ branches/Version-1_0-branch/controller/js/controller/ajax.js
2012-05-15 07:17:03 UTC (rev 9403)
@@ -316,8 +316,6 @@
});
- // file: control.xsl
- // When control area is selected, procedures are fetched from db and
procedure select list is populated
$("#control_area_id").change(function () {
var control_area_id = $(this).val();
@@ -350,6 +348,8 @@
}
});
});
+
+ /* ================================ CONTROL GROUP
================================== */
$("#frm_save_control_groups").submit(function(e){
var thisForm = $(this);
@@ -361,6 +361,8 @@
}
});
+ /* ================================ CONTROL ITEM
================================== */
+
$("#frm_control_items").submit(function(e){
var thisForm = $(this);
var num_checked = $(this).find("input:checked").length;
@@ -375,17 +377,14 @@
$("#frm_save_control_details").find(".focus").removeClass("focus");
$(this).addClass("focus");
});
-
- $("#frm_save_control_details input").focus(function(e){
-
$("#frm_save_control_details").find(".focus").removeClass("focus");
- $(this).addClass("focus");
- });
-
+
$("#frm_save_control_details select").focus(function(e){
$("#frm_save_control_details").find(".focus").removeClass("focus");
$(this).addClass("focus");
});
+ /* ========================= CONTROL
=============================================== */
+
// ================= SAVE CONTROL DETAILS - FORM SUBMIT
==================
$("#frm_save_control_details").submit(function(e){
@@ -430,56 +429,35 @@
});
- // Fetches info about a check list on hover status image icon
- $('a.view_info_box').bind('contextmenu', function(){
- var thisA = $(this);
- var divWrp = $(this).parent();
-
- var add_param = $(thisA).find("span").text();
-
- var oArgs =
{menuaction:'controller.uicheck_list.get_cases_for_check_list'};
- var baseUrl = phpGWLink('index.php', oArgs, true);
- var requestUrl = baseUrl + add_param
-
- //var requestUrl =
"http://portico/pe/index.php?menuaction=controller.uicheck_list.get_cases_for_check_list";
+ add_param;
-
- $.ajax({
- type: 'POST',
- url: requestUrl,
- dataType: 'json',
- success: function(data) {
- if(data){
- var obj = jQuery.parseJSON(data);
-
- // Show info box with info about check list
- var infoBox = $(divWrp).find("#info_box");
- $(infoBox).show();
-
- var htmlStr = "<h3>Åpne saker</h3>";
-
- $.each(obj, function(i) {
- htmlStr += "<div
class='check_item'><h5>" + (parseInt(i) + 1) + ". " + obj[i].control_item.title
+ "</h5>";
-
-
$(obj[i].cases_array).each(function(j) {
- htmlStr += "<p class='case'>"
+ "<label>Sak " + (parseInt(j) + 1) + ": </label>" +
obj[i].cases_array[j].descr + "</p>";
- });
- });
-
- htmlStr += "</div>";
-
- $(infoBox).html( htmlStr );
- }
- }
- });
-
- return false;
+ /* HELP TEXT */
+ $("#control_details input").focus(function(e){
+ var wrpElem = $(this).parents("dd");
+ $(wrpElem).find(".help_text").fadeIn(300);
});
- $("a.view_info_box").mouseout(function(){
- var infoBox = $(this).parent().find("#info_box");
+ $("#control_details input").focusout(function(e){
+ var wrpElem = $(this).parents("dd");
+ $(wrpElem).find(".help_text").fadeOut(300);
+ });
+
+ $("#control_details select").focus(function(e){
+ var wrpElem = $(this).parents("dd");
+ $(wrpElem).find(".help_text").fadeIn(300);
+ });
+
+ $("#control_details select").focusout(function(e){
+ var wrpElem = $(this).parents("dd");
+ $(wrpElem).find(".help_text").fadeOut(300);
+ });
+
+ /*
+ $(".frm_save_control_item").click(function(e){
+ var thisForm = $(this);
+ var submitBnt = $(thisForm).find("input[type='submit']");
- $(infoBox).hide();
+ $(submitBnt).removeClass("not_active");
});
+ */
$(".frm_save_control_item").live("click", function(e){
e.preventDefault();
@@ -505,8 +483,33 @@
});
});
- //=========================== CHECKLIST
================================
+ //===================================== CHECKLIST
================================
+ // ADD CHECKLIST
+ $("#frm_add_check_list").live("submit", function(e){
+
+ var thisForm = $(this);
+ var statusFieldVal = $("#status").val();
+ var completedDateVal = $("#completed_date").val();
+ var completedDateRow = $("#completed_date").closest(".row");
+
+ // Checks that COMPLETE DATE is set if status is set to DONE
+ if(statusFieldVal == 1 & completedDateVal == ''){
+ e.preventDefault();
+ // Displays error message above completed date
+ $(completedDateRow).before("<div
class='input_error_msg'>Vennligst angi når kontrollen ble utført</div>");
+ }
+ });
+
+ // Display submit button on click
+ $("#frm_add_check_list").live("click", function(e){
+ var thisForm = $(this);
+ var submitBnt = $(thisForm).find("input[type='submit']");
+ $(submitBnt).removeClass("not_active");
+ });
+
+
+
// UPDATE CHECKLIST DETAILS
$("#frm_update_check_list").live("submit", function(e){
e.preventDefault();
@@ -556,90 +559,13 @@
var submitBnt = $(thisForm).find("input[type='submit']");
$(submitBnt).removeClass("not_active");
});
-
- //============================= ADD CHECKLIST
===========================
-
- // ADD CHECKLIST
- $("#frm_add_check_list").live("submit", function(e){
-
- var thisForm = $(this);
- var statusFieldVal = $("#status").val();
- var completedDateVal = $("#completed_date").val();
- var completedDateRow = $("#completed_date").closest(".row");
-
- // Checks that COMPLETE DATE is set if status is set to DONE
- if(statusFieldVal == 1 & completedDateVal == ''){
- e.preventDefault();
- // Displays error message above completed date
- $(completedDateRow).before("<div
class='input_error_msg'>Vennligst angi når kontrollen ble utført</div>");
- }
- });
- // Display submit button on click
- $("#frm_add_check_list").live("click", function(e){
- var thisForm = $(this);
- var submitBnt = $(thisForm).find("input[type='submit']");
- $(submitBnt).removeClass("not_active");
- });
-
-
- //============================= MESSAGE ===========================
-
- // REGISTER MESSAGE
- $("#frmRegCaseMessage").submit(function(e){
-
- var thisForm = $(this);
- var $required_input_fields = $(this).find(".required");
- var status = true;
- // Checking that required fields (fields with class required)
is not null
- $required_input_fields.each(function() {
-
- // User has selected a value from select list
- if( $(this).is("select") & $(this).val() == 0 ){
- var nextElem = $(this).next();
-
- if( !$(nextElem).hasClass("input_error_msg") )
- $(this).after("<div
class='input_error_msg'>Vennligst velg fra listen</div>");
-
- status = false;
- }
- // Input field is not empty
- else if( $(this).is("input") & $(this).val() == '' ){
- var nextElem = $(this).next();
-
- if( !$(nextElem).hasClass("input_error_msg") )
- $(this).after("<div
class='input_error_msg'>Vennligst fyll ut dette feltet</div>");
-
- status = false;
- }
- else{
- var nextElem = $(this).next();
-
- if( $(nextElem).hasClass("input_error_msg") )
- $(nextElem).remove();
- }
- });
-
- if( $(thisForm).find('input[type=checkbox]:checked').length == 0){
-
- if(
!$(thisForm).find("ul.cases").prev().hasClass("input_error_msg") )
- $(thisForm).find("ul.cases").before("<div
class='input_error_msg'>Vennligst velg en sak som meldingen omfatter</div>");
-
- status = false;
- }
-
- if( !status ){
- e.preventDefault();
- }
-
- });
-
//======================================= CASE
======================================
// REGISTER CASE
@@ -876,31 +802,111 @@
$(submitBnt).removeClass("not_active");
});
- $("#control_details input").focus(function(e){
- var wrpElem = $(this).parents("dd");
- $(wrpElem).find(".help_text").fadeIn(300);
- });
+ //============================= MESSAGE ===========================
- $("#control_details input").focusout(function(e){
- var wrpElem = $(this).parents("dd");
- $(wrpElem).find(".help_text").fadeOut(300);
- });
+ // REGISTER MESSAGE
+ $("#frmRegCaseMessage").submit(function(e){
+
+ var thisForm = $(this);
+
+ var $required_input_fields = $(this).find(".required");
+ var status = true;
- $("#control_details select").focus(function(e){
- var wrpElem = $(this).parents("dd");
- $(wrpElem).find(".help_text").fadeIn(300);
+ // Checking that required fields (fields with class required)
is not null
+ $required_input_fields.each(function() {
+
+ // User has selected a value from select list
+ if( $(this).is("select") & $(this).val() == 0 ){
+ var nextElem = $(this).next();
+
+ if( !$(nextElem).hasClass("input_error_msg") )
+ $(this).after("<div
class='input_error_msg'>Vennligst velg fra listen</div>");
+
+ status = false;
+ }
+ // Input field is not empty
+ else if( $(this).is("input") & $(this).val() == '' ){
+ var nextElem = $(this).next();
+
+ if( !$(nextElem).hasClass("input_error_msg") )
+ $(this).after("<div
class='input_error_msg'>Vennligst fyll ut dette feltet</div>");
+
+ status = false;
+ }
+ else{
+ var nextElem = $(this).next();
+
+ if( $(nextElem).hasClass("input_error_msg") )
+ $(nextElem).remove();
+ }
+ });
+
+ if( $(thisForm).find('input[type=checkbox]:checked').length == 0){
+
+ if(
!$(thisForm).find("ul.cases").prev().hasClass("input_error_msg") )
+ $(thisForm).find("ul.cases").before("<div
class='input_error_msg'>Vennligst velg en sak som meldingen omfatter</div>");
+
+ status = false;
+ }
+
+ if( !status ){
+ e.preventDefault();
+ }
+
});
- $("#control_details select").focusout(function(e){
- var wrpElem = $(this).parents("dd");
- $(wrpElem).find(".help_text").fadeOut(300);
+
+ /* ================================== CALENDAR
===================================== */
+
+ // Fetches info about a check list on hover status image icon
+ $('a.view_info_box').bind('contextmenu', function(){
+ var thisA = $(this);
+ var divWrp = $(this).parent();
+
+ var add_param = $(thisA).find("span").text();
+
+ var oArgs =
{menuaction:'controller.uicheck_list.get_cases_for_check_list'};
+ var baseUrl = phpGWLink('index.php', oArgs, true);
+ var requestUrl = baseUrl + add_param
+
+ //var requestUrl =
"http://portico/pe/index.php?menuaction=controller.uicheck_list.get_cases_for_check_list";
+ add_param;
+
+ $.ajax({
+ type: 'POST',
+ url: requestUrl,
+ dataType: 'json',
+ success: function(data) {
+ if(data){
+ var obj = jQuery.parseJSON(data);
+
+ // Show info box with info about check list
+ var infoBox = $(divWrp).find("#info_box");
+ $(infoBox).show();
+
+ var htmlStr = "<h3>Åpne saker</h3>";
+
+ $.each(obj, function(i) {
+ htmlStr += "<div
class='check_item'><h5>" + (parseInt(i) + 1) + ". " + obj[i].control_item.title
+ "</h5>";
+
+
$(obj[i].cases_array).each(function(j) {
+ htmlStr += "<p class='case'>"
+ "<label>Sak " + (parseInt(j) + 1) + ": </label>" +
obj[i].cases_array[j].descr + "</p>";
+ });
+ });
+
+ htmlStr += "</div>";
+
+ $(infoBox).html( htmlStr );
+ }
+ }
+ });
+
+ return false;
});
- $(".frm_save_control_item").click(function(e){
- var thisForm = $(this);
- var submitBnt = $(thisForm).find("input[type='submit']");
+ $("a.view_info_box").mouseout(function(){
+ var infoBox = $(this).parent().find("#info_box");
- $(submitBnt).removeClass("not_active");
+ $(infoBox).hide();
});
Deleted: branches/Version-1_0-branch/controller/js/yahoo/control_tabs_rubbish.js
===================================================================
--- branches/Version-1_0-branch/controller/js/yahoo/control_tabs_rubbish.js
2012-05-15 07:14:06 UTC (rev 9402)
+++ branches/Version-1_0-branch/controller/js/yahoo/control_tabs_rubbish.js
2012-05-15 07:17:03 UTC (rev 9403)
@@ -1,15 +0,0 @@
-YAHOO.util.Event.addListener(window, "load", function() {
-
- /*
- var oArgs = {menuaction:'controller.uicontrol.edit'};
- var url = phpGWLink('index.php', oArgs, true);
- var colDefs = [{key: 'name', label: lang['Name'], formatter:
YAHOO.portico.formatLink}, {key: 'category', label: lang['Category']}, {key:
'actions', label: lang['Actions'], formatter:
YAHOO.portico.formatGenericLink(lang['Edit'], lang['Delete'])}];
- YAHOO.portico.inlineTableHelper('details_container', url, colDefs);
-
-
- var oArgs =
{menuaction:'booking.uipermission_resource.index',sort:'name',filter_object_id:resource_id};
- var url = phpGWLink('index.php', oArgs, true);
- var colDefs = [{key: 'subject_name', label: lang['Account']}, {key:
'role', label: lang['Role']}, {key: 'actions', label: lang['Actions'],
formatter: YAHOO.portico.formatGenericLink(lang['Edit'], lang['Delete'])}];
- YAHOO.portico.inlineTableHelper('permissions_container', url,
colDefs);*/
-});
-
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-15 07:14:06 UTC (rev 9402)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month.xsl
2012-05-15 07:17:03 UTC (rev 9403)
@@ -41,7 +41,7 @@
<xsl:text>&location_code=</xsl:text>
<xsl:value-of
select="//current_location/location_code"/>
</xsl:attribute>
- <img height="17"
src="controller/images/left_arrow_simple_black.png" />
+ <img height="17"
src="controller/images/left_arrow_simple_light_blue.png" />
<xsl:variable
name="month_str">month <xsl:value-of select="current_month_nr - 1"/>
capitalized</xsl:variable>
<xsl:value-of
select="php:function('lang', $month_str)" />
</a>
@@ -56,7 +56,7 @@
<xsl:text>&location_code=</xsl:text>
<xsl:value-of
select="//current_location/location_code"/>
</xsl:attribute>
- <img height="17"
src="controller/images/left_arrow_simple_black.png" />
+ <img height="17"
src="controller/images/left_arrow_simple_light_blue.png" />
<xsl:variable
name="month_str">month 12 capitalized</xsl:variable>
<xsl:value-of
select="php:function('lang', $month_str)" />
</a>
@@ -81,7 +81,7 @@
</xsl:attribute>
<xsl:variable
name="month_str">month <xsl:value-of select="current_month_nr + 1"/>
capitalized</xsl:variable>
<xsl:value-of
select="php:function('lang', $month_str)" />
- <img height="17"
src="controller/images/right_arrow_simple_black.png" />
+ <img height="17"
src="controller/images/right_arrow_simple_light_blue.png" />
</a>
</xsl:when>
<xsl:otherwise>
@@ -96,7 +96,7 @@
</xsl:attribute>
<xsl:variable
name="month_str">month 1 capitalized</xsl:variable>
<xsl:value-of
select="php:function('lang', $month_str)" />
- <img height="17"
src="controller/images/right_arrow_simple_black.png" />
+ <img height="17"
src="controller/images/right_arrow_simple_light_blue.png" />
</a>
</xsl:otherwise>
</xsl:choose>
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-15 07:14:06 UTC (rev 9402)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year.xsl
2012-05-15 07:17:03 UTC (rev 9403)
@@ -27,7 +27,7 @@
<xsl:text>&location_code=</xsl:text>
<xsl:value-of
select="current_location/location_code"/>
</xsl:attribute>
- <img height="17"
src="controller/images/left_arrow_simple_black.png" />
+ <img height="17"
src="controller/images/left_arrow_simple_light_blue.png" />
<xsl:value-of select="current_year -
1"/>
</a>
<span class="current">
@@ -42,7 +42,7 @@
<xsl:value-of
select="current_location/location_code"/>
</xsl:attribute>
<xsl:value-of select="current_year +
1"/>
- <img height="17"
src="controller/images/right_arrow_simple_black.png" />
+ <img height="17"
src="controller/images/right_arrow_simple_light_blue.png" />
</a>
</div>
Modified:
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
2012-05-15 07:14:06 UTC (rev 9402)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
2012-05-15 07:17:03 UTC (rev 9403)
@@ -7,7 +7,7 @@
<div id="control_plan">
<div class="top">
<h1>Kontrollplan for <xsl:value-of
select="control/title"/></h1>
- <h3>Periode: <xsl:value-of select="period"/></h3>
+ <h3>Periode: <xsl:value-of select="current_year"/></h3>
<!-- ===================== SELECT MY LOCATIONS
================= -->
<xsl:call-template name="select_my_locations" />
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-15 07:14:06 UTC (rev 9402)
+++ branches/Version-1_0-branch/controller/templates/base/css/base.css
2012-05-15 07:17:03 UTC (rev 9403)
@@ -1129,7 +1129,7 @@
}
ul#search_list input[type="submit"] {
margin: 0;
- padding: 3px 15px;
+ padding: 2px 15px;
}
ul#search_list input[type="text"] {
margin: 0 5px 0 0;
Modified: branches/Version-1_0-branch/registration/js/portico/ajax.js
===================================================================
--- branches/Version-1_0-branch/registration/js/portico/ajax.js 2012-05-15
07:14:06 UTC (rev 9402)
+++ branches/Version-1_0-branch/registration/js/portico/ajax.js 2012-05-15
07:17:03 UTC (rev 9403)
@@ -202,6 +202,67 @@
}
});
});
+/*
+$(".choose_loc").live( "change", function () {
+ var thisSelectBox = $(this);
+ var loc_code = $(this).val();
+ var loc_id = $(this).attr("id");
+ var loc_arr = loc_id.split('_');
+ var loc_level = parseInt(loc_arr[1]);
+ var new_loc_id = "loc_" + (parseInt(loc_level)+1);
+
+ var id = "";
+ var new_loc_code = "";
+ var level;
+ for(level = 1;level <= loc_level;level++){
+ id = "loc_" + level;
+ if(level > 1)
+ new_loc_code += "-" + $("#" + id).val();
+ else
+ new_loc_code += $("#" + id).val();
+ }
+
+ if(!loc_code)
+ {
+ return false;
+ }
+ var oArgs = {menuaction:'registration.boreg.get_locations',
location_code:new_loc_code};
+ var requestUrl = phpGWLink('registration/main.php', oArgs,
true);
+
+ var htmlString = "";
+
+ $.ajax({
+ type: 'POST',
+ dataType: 'json',
+ url: requestUrl,
+ success: function(data) {
+ if( data != null)
+ {
+ htmlString = "<select
class='choose_loc' name='" + new_loc_id + "' id='" + new_loc_id + "' >" +
+ "<option
value = ''>" + data.length + " lokasjone(r) funnet</option>";
+
+
+ var obj = data;
+
+ $.each(obj, function(i) {
+ htmlString += "<option
value='" + obj[i].id + "'>" + obj[i].name + "</option>";
+ });
+
+ htmlString += "</select>";
+
+ $(thisSelectBox).after( htmlString );
+ }
+ else
+ {
+ htmlString += "<option>Ingen
lokasjoner</option>"
+ $(new_loc_id).html( htmlString );
+ }
+ }
+ });
+ });
+
+*/
+
});
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9403] Merge 9397:9402 from trunk,
Sigurd Nes <=