[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9397] Merge 9391:9396 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9397] Merge 9391:9396 from trunk |
|
Date: |
Mon, 14 May 2012 12:19:53 +0000 |
Revision: 9397
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9397
Author: sigurdne
Date: 2012-05-14 12:19:52 +0000 (Mon, 14 May 2012)
Log Message:
-----------
Merge 9391:9396 from trunk
Modified Paths:
--------------
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/check_list/view_open_cases.xsl
branches/Version-1_0-branch/controller/templates/base/css/base.css
branches/Version-1_0-branch/property/inc/class.uiwo_hour.inc.php
Added Paths:
-----------
branches/Version-1_0-branch/controller/images/left_arrow_simple_black.png
branches/Version-1_0-branch/controller/images/right_arrow_simple_black.png
branches/Version-1_0-branch/controller/js/controller/yui_drag_drop_garbish.js
branches/Version-1_0-branch/controller/js/yahoo/control_tabs_rubbish.js
Removed Paths:
-------------
branches/Version-1_0-branch/controller/js/controller/yui_drag_drop.js
branches/Version-1_0-branch/controller/js/yahoo/control_tabs.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
+
/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
Copied:
branches/Version-1_0-branch/controller/images/left_arrow_simple_black.png (from
rev 9396, trunk/controller/images/left_arrow_simple_black.png)
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/controller/images/right_arrow_simple_black.png
(from rev 9396, trunk/controller/images/right_arrow_simple_black.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-14 12:17:56 UTC (rev 9396)
+++ branches/Version-1_0-branch/controller/inc/class.uicontrol_location.inc.php
2012-05-14 12:19:52 UTC (rev 9397)
@@ -172,12 +172,12 @@
)
)
);
-
+
phpgwapi_yui::load_widget('paginator');
- self::add_javascript('controller', 'yahoo',
'control_tabs.js');
+ //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');
+ self::add_javascript('controller', 'controller',
'ajax.js');
self::render_template_xsl(array('control_location/control_location_tabs',
'control_location/view_locations_for_control', 'common' ), $data);
}
@@ -350,7 +350,7 @@
phpgwapi_yui::load_widget('paginator');
- self::add_javascript('controller', 'yahoo',
'control_tabs.js');
+ //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-14 12:17:56 UTC (rev 9396)
+++ branches/Version-1_0-branch/controller/js/controller/ajax.js
2012-05-14 12:19:52 UTC (rev 9397)
@@ -58,8 +58,6 @@
});
});
-
- //
$("#choose_my_location").change(function () {
var location_code = $(this).val();
var thisForm = $(this).parents("form");
@@ -109,7 +107,7 @@
htmlString += "<option>Ingen
kontroller</option>"
$("#cat_id").html( htmlString );
}
- }
+ },
error: function(XMLHttpRequest, textStatus, errorThrown) {
if (XMLHttpRequest.status === 401) {
location.href = '/';
@@ -149,8 +147,6 @@
});
});
- // file: uicheck_list.xsl
- // When control area is selected, controls are fetched from db and
control select list is populated
$("#control_area_list").change(function () {
var control_area_id = $(this).val();
var oArgs =
{menuaction:'controller.uicontrol.get_controls_by_control_area',
phpgw_return_as:'json'};
@@ -730,7 +726,7 @@
});
});
- $("a.quick_edit").live("click", function(e){
+ $("a.quick_edit_case").live("click", function(e){
var clickElem = $(this);
var clickRow = $(this).closest("li");
@@ -874,13 +870,6 @@
return false;
});
- /*
- $(".frm_save_check_item").live("click", function(e){
- var thisForm = $(this);
- var submitBnt = $(thisForm).find("input[type='submit']");
- $(submitBnt).removeClass("not_active");
- });
- */
$(".frm_register_case").live("click", function(e){
var thisForm = $(this);
var submitBnt = $(thisForm).find("input[type='submit']");
@@ -906,14 +895,7 @@
var wrpElem = $(this).parents("dd");
$(wrpElem).find(".help_text").fadeOut(300);
});
- /*
- $(".frm_save_check_item").click(function(e){
- var thisForm = $(this);
- var submitBnt = $(thisForm).find("input[type='submit']");
-
- $(submitBnt).removeClass("not_active");
- });
- */
+
$(".frm_save_control_item").click(function(e){
var thisForm = $(this);
var submitBnt = $(thisForm).find("input[type='submit']");
Deleted: branches/Version-1_0-branch/controller/js/controller/yui_drag_drop.js
===================================================================
--- branches/Version-1_0-branch/controller/js/controller/yui_drag_drop.js
2012-05-14 12:17:56 UTC (rev 9396)
+++ branches/Version-1_0-branch/controller/js/controller/yui_drag_drop.js
2012-05-14 12:19:52 UTC (rev 9397)
@@ -1,96 +0,0 @@
-YUI().use('dd-constrain', 'dd-proxy', 'dd-drop', function(Y) {
- //Listen for all drop:over events
- Y.DD.DDM.on('drop:over', function(e) {
- //Get a reference to our drag and drop nodes
- var drag = e.drag.get('node'),
- drop = e.drop.get('node');
-
- //Are we dropping on a li node?
- if (drop.get('tagName').toLowerCase() === 'li') {
- //Are we not going up?
- if (!goingUp) {
- drop = drop.get('nextSibling');
- }
- //Add the node to this list
- e.drop.get('node').get('parentNode').insertBefore(drag, drop);
- //Resize this nodes shim, so we can drop on it later.
- e.drop.sizeShim();
- }
- });
- //Listen for all drag:drag events
- Y.DD.DDM.on('drag:drag', function(e) {
- //Get the last y point
- var y = e.target.lastXY[1];
- //is it greater than the lastY var?
- if (y < lastY) {
- //We are going up
- goingUp = true;
- } else {
- //We are going down.
- goingUp = false;
- }
- //Cache for next check
- lastY = y;
- });
- //Listen for all drag:start events
- Y.DD.DDM.on('drag:start', function(e) {
- //Get our drag object
- var drag = e.target;
- //Set some styles here
- drag.get('node').setStyle('opacity', '.25');
- drag.get('dragNode').set('innerHTML',
drag.get('node').get('innerHTML'));
- drag.get('dragNode').setStyles({
- opacity: '.5',
- borderColor: drag.get('node').getStyle('borderColor'),
- backgroundColor: drag.get('node').getStyle('backgroundColor')
- });
- });
- //Listen for a drag:end events
- Y.DD.DDM.on('drag:end', function(e) {
- var drag = e.target;
- //Put our styles back
- drag.get('node').setStyles({
- visibility: '',
- opacity: '1'
- });
- });
- //Listen for all drag:drophit events
- Y.DD.DDM.on('drag:drophit', function(e) {
- var drop = e.drop.get('node'),
- drag = e.drag.get('node');
-
- //if we are not on an li, we must have been dropped on a ul
- if (drop.get('tagName').toLowerCase() !== 'li') {
- if (!drop.contains(drag)) {
- drop.appendChild(drag);
- }
- }
- });
-
- //Static Vars
- var goingUp = false, lastY = 0;
-
- //Get the list of li's in the lists and make them draggable
- var lis = Y.Node.all('#play ul li');
- lis.each(function(v, k) {
- var dd = new Y.DD.Drag({
- node: v,
- target: {
- padding: '0 0 0 20'
- }
- }).plug(Y.Plugin.DDProxy, {
- moveOnEnd: false
- }).plug(Y.Plugin.DDConstrained, {
- constrain2node: '#play'
- });
- });
-
- //Create simple targets for the 2 lists.
- var uls = Y.Node.all('#play ul');
- uls.each(function(v, k) {
- var tar = new Y.DD.Drop({
- node: v
- });
- });
-
-});
\ No newline at end of file
Copied:
branches/Version-1_0-branch/controller/js/controller/yui_drag_drop_garbish.js
(from rev 9396, trunk/controller/js/controller/yui_drag_drop_garbish.js)
===================================================================
---
branches/Version-1_0-branch/controller/js/controller/yui_drag_drop_garbish.js
(rev 0)
+++
branches/Version-1_0-branch/controller/js/controller/yui_drag_drop_garbish.js
2012-05-14 12:19:52 UTC (rev 9397)
@@ -0,0 +1,96 @@
+YUI().use('dd-constrain', 'dd-proxy', 'dd-drop', function(Y) {
+ //Listen for all drop:over events
+ Y.DD.DDM.on('drop:over', function(e) {
+ //Get a reference to our drag and drop nodes
+ var drag = e.drag.get('node'),
+ drop = e.drop.get('node');
+
+ //Are we dropping on a li node?
+ if (drop.get('tagName').toLowerCase() === 'li') {
+ //Are we not going up?
+ if (!goingUp) {
+ drop = drop.get('nextSibling');
+ }
+ //Add the node to this list
+ e.drop.get('node').get('parentNode').insertBefore(drag, drop);
+ //Resize this nodes shim, so we can drop on it later.
+ e.drop.sizeShim();
+ }
+ });
+ //Listen for all drag:drag events
+ Y.DD.DDM.on('drag:drag', function(e) {
+ //Get the last y point
+ var y = e.target.lastXY[1];
+ //is it greater than the lastY var?
+ if (y < lastY) {
+ //We are going up
+ goingUp = true;
+ } else {
+ //We are going down.
+ goingUp = false;
+ }
+ //Cache for next check
+ lastY = y;
+ });
+ //Listen for all drag:start events
+ Y.DD.DDM.on('drag:start', function(e) {
+ //Get our drag object
+ var drag = e.target;
+ //Set some styles here
+ drag.get('node').setStyle('opacity', '.25');
+ drag.get('dragNode').set('innerHTML',
drag.get('node').get('innerHTML'));
+ drag.get('dragNode').setStyles({
+ opacity: '.5',
+ borderColor: drag.get('node').getStyle('borderColor'),
+ backgroundColor: drag.get('node').getStyle('backgroundColor')
+ });
+ });
+ //Listen for a drag:end events
+ Y.DD.DDM.on('drag:end', function(e) {
+ var drag = e.target;
+ //Put our styles back
+ drag.get('node').setStyles({
+ visibility: '',
+ opacity: '1'
+ });
+ });
+ //Listen for all drag:drophit events
+ Y.DD.DDM.on('drag:drophit', function(e) {
+ var drop = e.drop.get('node'),
+ drag = e.drag.get('node');
+
+ //if we are not on an li, we must have been dropped on a ul
+ if (drop.get('tagName').toLowerCase() !== 'li') {
+ if (!drop.contains(drag)) {
+ drop.appendChild(drag);
+ }
+ }
+ });
+
+ //Static Vars
+ var goingUp = false, lastY = 0;
+
+ //Get the list of li's in the lists and make them draggable
+ var lis = Y.Node.all('#play ul li');
+ lis.each(function(v, k) {
+ var dd = new Y.DD.Drag({
+ node: v,
+ target: {
+ padding: '0 0 0 20'
+ }
+ }).plug(Y.Plugin.DDProxy, {
+ moveOnEnd: false
+ }).plug(Y.Plugin.DDConstrained, {
+ constrain2node: '#play'
+ });
+ });
+
+ //Create simple targets for the 2 lists.
+ var uls = Y.Node.all('#play ul');
+ uls.each(function(v, k) {
+ var tar = new Y.DD.Drop({
+ node: v
+ });
+ });
+
+});
\ No newline at end of file
Deleted: branches/Version-1_0-branch/controller/js/yahoo/control_tabs.js
===================================================================
--- branches/Version-1_0-branch/controller/js/yahoo/control_tabs.js
2012-05-14 12:17:56 UTC (rev 9396)
+++ branches/Version-1_0-branch/controller/js/yahoo/control_tabs.js
2012-05-14 12:19:52 UTC (rev 9397)
@@ -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);*/
-});
-
Copied: branches/Version-1_0-branch/controller/js/yahoo/control_tabs_rubbish.js
(from rev 9396, trunk/controller/js/yahoo/control_tabs_rubbish.js)
===================================================================
--- branches/Version-1_0-branch/controller/js/yahoo/control_tabs_rubbish.js
(rev 0)
+++ branches/Version-1_0-branch/controller/js/yahoo/control_tabs_rubbish.js
2012-05-14 12:19:52 UTC (rev 9397)
@@ -0,0 +1,15 @@
+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-14 12:17:56 UTC (rev 9396)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_month.xsl
2012-05-14 12:19:52 UTC (rev 9397)
@@ -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.png" />
+ <img height="17"
src="controller/images/left_arrow_simple_black.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.png" />
+ <img height="17"
src="controller/images/left_arrow_simple_black.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.png" />
+ <img height="17"
src="controller/images/right_arrow_simple_black.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.png" />
+ <img height="17"
src="controller/images/right_arrow_simple_black.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-14 12:17:56 UTC (rev 9396)
+++
branches/Version-1_0-branch/controller/templates/base/calendar/view_calendar_year.xsl
2012-05-14 12:19:52 UTC (rev 9397)
@@ -27,8 +27,12 @@
<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" />
<xsl:value-of select="current_year -
1"/>
</a>
+ <span class="current">
+ <xsl:value-of
select="current_year"/>
+ </span>
<a class="showNext">
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:text>
@@ -38,6 +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" />
</a>
</div>
Modified:
branches/Version-1_0-branch/controller/templates/base/check_list/view_open_cases.xsl
===================================================================
---
branches/Version-1_0-branch/controller/templates/base/check_list/view_open_cases.xsl
2012-05-14 12:17:56 UTC (rev 9396)
+++
branches/Version-1_0-branch/controller/templates/base/check_list/view_open_cases.xsl
2012-05-14 12:19:52 UTC (rev 9397)
@@ -59,7 +59,7 @@
<!-- === QUICK EDIT MENU === -->
<div class="quick_menu">
-
<a class="quick_edit" href="">
+
<a class="quick_edit_case" href="">
endre
</a>
<a class="close_case">
@@ -210,7 +210,7 @@
<div class="case_info">
<div class="case_descr"><xsl:value-of select="descr"/></div>
<div class="quick_menu">
-
<a class="quick_edit first" href="">
+
<a class="quick_edit_case first" href="">
endre
</a>
<a class="close_case">
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-14 12:17:56 UTC (rev 9396)
+++ branches/Version-1_0-branch/controller/templates/base/css/base.css
2012-05-14 12:19:52 UTC (rev 9397)
@@ -402,7 +402,7 @@
}
input[type="submit"] {
background: none repeat scroll 0 0 #4F9AEA;
- border: 0 none;
+ border: 1px solid #4685C8;
border-radius: 4px 4px 4px 4px;
color: #FFFFFF;
cursor: pointer;
@@ -1029,7 +1029,6 @@
#calNav a.showPrev {
display: block;
float: left;
- margin-left: 547px;
padding-left: 3px;
padding-top: 5px;
vertical-align: sub;
@@ -1037,12 +1036,11 @@
#calNav a.showPrev img{
margin-right:5px;
}
-#calNav a.showPrev.month {
- margin-left: 437px;
-}
#calNav .current {
+ display: block;
+ float: left;
font-size: 21px;
- padding-left: 200px;
+ padding-left: 500px;
}
/* ====================== CALENDAR INFO BOX ========================== */
@@ -1381,10 +1379,10 @@
vertical-align: top;
}
-li.check_item_case ul li.quick_edit {
+li.check_item_case ul li.quick_edit_case {
padding: 0;
}
-li.check_item_case .quick_edit h4 {
+li.check_item_case .quick_edit_case h4 {
color: #000000;
margin: 0;
padding: 2px 10px;
@@ -1407,7 +1405,7 @@
padding: 3%;
vertical-align: top;
}
-#main_content .quick_edit fieldset {
+#main_content .quick_edit_case fieldset {
padding: 5px;
}
Modified: branches/Version-1_0-branch/property/inc/class.uiwo_hour.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiwo_hour.inc.php
2012-05-14 12:17:56 UTC (rev 9396)
+++ branches/Version-1_0-branch/property/inc/class.uiwo_hour.inc.php
2012-05-14 12:19:52 UTC (rev 9397)
@@ -1445,7 +1445,7 @@
{
if(isset($this->config->config_data['invoice_acl']) &&
$this->config->config_data['invoice_acl'] == 'dimb')
{
- $approve_role =
execMethod('property.boinvoice.check_role', $project['ecodimb'] ?
$project['ecodimb'] : $workorder['workorder']['ecodimb']);
+ $approve_role =
execMethod('property.boinvoice.check_role', $project['ecodimb'] ?
$project['ecodimb'] : $workorder['ecodimb']);
$_ok = false;
if($approve_role['is_supervisor'])
@@ -1908,7 +1908,7 @@
{
$_ok = true;
}
- else if( $workorder['approved'] )
+ else if( $common_data['workorder']['approved'] )
{
$_ok = true;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9397] Merge 9391:9396 from trunk,
Sigurd Nes <=