[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11060] Merge 11054:11059 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [11060] Merge 11054:11059 from trunk |
|
Date: |
Mon, 15 Apr 2013 10:26:28 +0000 |
Revision: 11060
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11060
Author: sigurdne
Date: 2013-04-15 10:26:27 +0000 (Mon, 15 Apr 2013)
Log Message:
-----------
Merge 11054:11059 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/mobilefrontend/controller/class.uicalendar.inc.php
branches/Version-1_0-branch/mobilefrontend/controller/class.uicase.inc.php
branches/Version-1_0-branch/mobilefrontend/controller/class.uicheck_list.inc.php
branches/Version-1_0-branch/mobilefrontend/controller/class.uicheck_list_for_component.inc.php
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol.inc.php
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_group.inc.php
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_group_component.inc.php
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_item.inc.php
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_register_to_component.inc.php
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_register_to_location.inc.php
branches/Version-1_0-branch/mobilefrontend/controller/class.uidocument.inc.php
branches/Version-1_0-branch/mobilefrontend/controller/class.uiprocedure.inc.php
branches/Version-1_0-branch/mobilefrontend/home.php
branches/Version-1_0-branch/mobilefrontend/property/class.uitts.inc.php
branches/Version-1_0-branch/phpgwapi/templates/mobilefrontend/css/frontend.css
branches/Version-1_0-branch/phpgwapi/templates/mobilefrontend/head.inc.php
branches/Version-1_0-branch/phpgwapi/templates/mobilefrontend/head.tpl
branches/Version-1_0-branch/phpgwapi/templates/mobilefrontend/navbar.inc.php
branches/Version-1_0-branch/phpgwapi/templates/mobilefrontend/navbar.tpl
branches/Version-1_0-branch/phpgwapi/templates/verdilak/css/styles.css
branches/Version-1_0-branch/phpgwapi/templates/verdilak/navbar.inc.php
branches/Version-1_0-branch/phpgwapi/templates/verdilak/navbar.tpl
branches/Version-1_0-branch/property/inc/class.solocation.inc.php
branches/Version-1_0-branch/property/inc/class.uitts.inc.php
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-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494,10496-10503,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543,10545-10568,10570-10584,10586-10590,10592-10594,10596,10598-10599,10601-10611,10613,10615,10617-10626,10628-10636,10638,10640-10654,10656-10658,10660,10662-10672,10674,10676-10682,10684,10686,10688-10690,10692-10694,10696-10697,10699-10701,10703,10705-10706,10708-10724,10726-10731,10734,10736-10748,10750-10796,10798-10939,10941,10943,10945,10947-10953,10955,10957-10961,10963,10965-10966,10968-11001,11003-11030,11032-11034,11036,11038,11040,11042-11053
+
/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-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494,10496-10503,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543,10545-10568,10570-10584,10586-10590,10592-10594,10596,10598-10599,10601-10611,10613,10615,10617-10626,10628-10636,10638,10640-10654,10656-10658,10660,10662-10672,10674,10676-10682,10684,10686,10688-10690,10692-10694,10696-10697,10699-10701,10703,10705-10706,10708-10724,10726-10731,10734,10736-10748,10750-10796,10798-10939,10941,10943,10945,10947-10953,10955,10957-10961,10963,10965-10966,10968-11001,11003-11030,11032-11034,11036,11038,11040,11042-11053,11055-11059
Modified:
branches/Version-1_0-branch/mobilefrontend/controller/class.uicalendar.inc.php
===================================================================
---
branches/Version-1_0-branch/mobilefrontend/controller/class.uicalendar.inc.php
2013-04-12 13:55:58 UTC (rev 11059)
+++
branches/Version-1_0-branch/mobilefrontend/controller/class.uicalendar.inc.php
2013-04-15 10:26:27 UTC (rev 11060)
@@ -36,5 +36,6 @@
public function __construct()
{
parent::__construct();
+ $GLOBALS['phpgw_info']['flags']['nonavbar'] = true;
}
}
Modified:
branches/Version-1_0-branch/mobilefrontend/controller/class.uicase.inc.php
===================================================================
--- branches/Version-1_0-branch/mobilefrontend/controller/class.uicase.inc.php
2013-04-12 13:55:58 UTC (rev 11059)
+++ branches/Version-1_0-branch/mobilefrontend/controller/class.uicase.inc.php
2013-04-15 10:26:27 UTC (rev 11060)
@@ -36,6 +36,7 @@
public function __construct()
{
parent::__construct();
+ $GLOBALS['phpgw_info']['flags']['nonavbar'] = true;
//FIXME
$GLOBALS['phpgw']->css->add_external_file('controller/templates/mobilefrontend/css/base.css');
}
Modified:
branches/Version-1_0-branch/mobilefrontend/controller/class.uicheck_list.inc.php
===================================================================
---
branches/Version-1_0-branch/mobilefrontend/controller/class.uicheck_list.inc.php
2013-04-12 13:55:58 UTC (rev 11059)
+++
branches/Version-1_0-branch/mobilefrontend/controller/class.uicheck_list.inc.php
2013-04-15 10:26:27 UTC (rev 11060)
@@ -35,7 +35,7 @@
public function __construct()
{
parent::__construct();
-
+ $GLOBALS['phpgw_info']['flags']['nonavbar'] = true;
//FIXME
$GLOBALS['phpgw']->css->add_external_file('controller/templates/mobilefrontend/css/base.css');
}
Modified:
branches/Version-1_0-branch/mobilefrontend/controller/class.uicheck_list_for_component.inc.php
===================================================================
---
branches/Version-1_0-branch/mobilefrontend/controller/class.uicheck_list_for_component.inc.php
2013-04-12 13:55:58 UTC (rev 11059)
+++
branches/Version-1_0-branch/mobilefrontend/controller/class.uicheck_list_for_component.inc.php
2013-04-15 10:26:27 UTC (rev 11060)
@@ -36,5 +36,6 @@
public function __construct()
{
parent::__construct();
+ $GLOBALS['phpgw_info']['flags']['nonavbar'] = true;
}
}
Modified:
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol.inc.php
===================================================================
---
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol.inc.php
2013-04-12 13:55:58 UTC (rev 11059)
+++
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol.inc.php
2013-04-15 10:26:27 UTC (rev 11060)
@@ -36,5 +36,6 @@
public function __construct()
{
parent::__construct();
+ $GLOBALS['phpgw_info']['flags']['nonavbar'] = true;
}
}
Modified:
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_group.inc.php
===================================================================
---
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_group.inc.php
2013-04-12 13:55:58 UTC (rev 11059)
+++
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_group.inc.php
2013-04-15 10:26:27 UTC (rev 11060)
@@ -36,5 +36,6 @@
public function __construct()
{
parent::__construct();
+ $GLOBALS['phpgw_info']['flags']['nonavbar'] = true;
}
}
Modified:
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_group_component.inc.php
===================================================================
---
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_group_component.inc.php
2013-04-12 13:55:58 UTC (rev 11059)
+++
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_group_component.inc.php
2013-04-15 10:26:27 UTC (rev 11060)
@@ -36,5 +36,6 @@
public function __construct()
{
parent::__construct();
+ $GLOBALS['phpgw_info']['flags']['nonavbar'] = true;
}
}
Modified:
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_item.inc.php
===================================================================
---
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_item.inc.php
2013-04-12 13:55:58 UTC (rev 11059)
+++
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_item.inc.php
2013-04-15 10:26:27 UTC (rev 11060)
@@ -36,5 +36,6 @@
public function __construct()
{
parent::__construct();
+ $GLOBALS['phpgw_info']['flags']['nonavbar'] = true;
}
}
Modified:
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_register_to_component.inc.php
===================================================================
---
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_register_to_component.inc.php
2013-04-12 13:55:58 UTC (rev 11059)
+++
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_register_to_component.inc.php
2013-04-15 10:26:27 UTC (rev 11060)
@@ -36,5 +36,6 @@
public function __construct()
{
parent::__construct();
+ $GLOBALS['phpgw_info']['flags']['nonavbar'] = true;
}
}
Modified:
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_register_to_location.inc.php
===================================================================
---
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_register_to_location.inc.php
2013-04-12 13:55:58 UTC (rev 11059)
+++
branches/Version-1_0-branch/mobilefrontend/controller/class.uicontrol_register_to_location.inc.php
2013-04-15 10:26:27 UTC (rev 11060)
@@ -37,5 +37,6 @@
public function __construct()
{
parent::__construct();
+ $GLOBALS['phpgw_info']['flags']['nonavbar'] = true;
}
}
Modified:
branches/Version-1_0-branch/mobilefrontend/controller/class.uidocument.inc.php
===================================================================
---
branches/Version-1_0-branch/mobilefrontend/controller/class.uidocument.inc.php
2013-04-12 13:55:58 UTC (rev 11059)
+++
branches/Version-1_0-branch/mobilefrontend/controller/class.uidocument.inc.php
2013-04-15 10:26:27 UTC (rev 11060)
@@ -36,5 +36,6 @@
public function __construct()
{
parent::__construct();
+ $GLOBALS['phpgw_info']['flags']['nonavbar'] = true;
}
}
Modified:
branches/Version-1_0-branch/mobilefrontend/controller/class.uiprocedure.inc.php
===================================================================
---
branches/Version-1_0-branch/mobilefrontend/controller/class.uiprocedure.inc.php
2013-04-12 13:55:58 UTC (rev 11059)
+++
branches/Version-1_0-branch/mobilefrontend/controller/class.uiprocedure.inc.php
2013-04-15 10:26:27 UTC (rev 11060)
@@ -36,5 +36,6 @@
public function __construct()
{
parent::__construct();
+ $GLOBALS['phpgw_info']['flags']['nonavbar'] = true;
}
}
Modified: branches/Version-1_0-branch/mobilefrontend/home.php
===================================================================
--- branches/Version-1_0-branch/mobilefrontend/home.php 2013-04-12 13:55:58 UTC
(rev 11059)
+++ branches/Version-1_0-branch/mobilefrontend/home.php 2013-04-15 10:26:27 UTC
(rev 11060)
@@ -18,7 +18,7 @@
$GLOBALS['phpgw_info']['flags'] = array
(
'noheader' => true,
- 'nonavbar' => false,
+ 'nonavbar' => true,
'currentapp' => 'home',
'enable_network_class' => true,
'enable_contacts_class' => true,
Modified:
branches/Version-1_0-branch/mobilefrontend/property/class.uitts.inc.php
===================================================================
--- branches/Version-1_0-branch/mobilefrontend/property/class.uitts.inc.php
2013-04-12 13:55:58 UTC (rev 11059)
+++ branches/Version-1_0-branch/mobilefrontend/property/class.uitts.inc.php
2013-04-15 10:26:27 UTC (rev 11060)
@@ -35,5 +35,6 @@
public function __construct()
{
parent::__construct();
+ $GLOBALS['phpgw_info']['flags']['nonavbar'] = true;
}
}
Modified:
branches/Version-1_0-branch/phpgwapi/templates/mobilefrontend/css/frontend.css
===================================================================
---
branches/Version-1_0-branch/phpgwapi/templates/mobilefrontend/css/frontend.css
2013-04-12 13:55:58 UTC (rev 11059)
+++
branches/Version-1_0-branch/phpgwapi/templates/mobilefrontend/css/frontend.css
2013-04-15 10:26:27 UTC (rev 11060)
@@ -291,7 +291,6 @@
width: 100%;
textalign: left;
margin: 0 auto;
-overflow: hidden;
padding: 0 0px 40px;
}
@@ -323,7 +322,27 @@
line-height: 1.2em;
}
+#app-menu{
+margin: 0 0 0 16px !important;
+}
+#app-menu a{
+border-right: 1px solid #575757;
+padding: 0 0.5em;
+line-height: 1.2em;
+}
+
+#applications{
+margin: 0 0 0 16px !important;
+}
+
+#applications a{
+border-right: 1px solid #575757;
+padding: 0 0.5em;
+line-height: 1.2em;
+}
+
+
#logo{
background: url(../images/newlayout/logo.png) no-repeat;
float: left;
Modified:
branches/Version-1_0-branch/phpgwapi/templates/mobilefrontend/head.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/templates/mobilefrontend/head.inc.php
2013-04-12 13:55:58 UTC (rev 11059)
+++ branches/Version-1_0-branch/phpgwapi/templates/mobilefrontend/head.inc.php
2013-04-15 10:26:27 UTC (rev 11060)
@@ -59,30 +59,7 @@
}
}
- // Construct navbar_config by taking into account the current selected
menu
- // The only problem with this loop is that leafnodes will be included
- $navbar_config = execMethod('phpgwapi.template_portico.retrieve_local',
'navbar_config');
- if( isset($GLOBALS['phpgw_info']['flags']['menu_selection']) )
- {
- if(!isset($navbar_config))
- {
- $navbar_config = array();
- }
-
- $current_selection =
$GLOBALS['phpgw_info']['flags']['menu_selection'];
-
- while($current_selection)
- {
- $navbar_config["navbar::$current_selection"] = true;
- $current_selection = implode("::", explode("::",
$current_selection, -1));
- }
-
- phpgwapi_template_portico::store_local('navbar_config',
$navbar_config);
- }
-
- $_navbar_config = json_encode($navbar_config);
-
$app = lang($app);
$tpl_vars = array
(
@@ -93,13 +70,13 @@
'str_base_url' => $GLOBALS['phpgw']->link('/', array(), true),
'webserver_url' =>
$GLOBALS['phpgw_info']['server']['webserver_url'],
'win_on_events' => $GLOBALS['phpgw']->common->get_on_events(),
- 'navbar_config' => $_navbar_config,
+ 'current_app_header' =>
isset($GLOBALS['phpgw_info']['flags']['app_header']) &&
$GLOBALS['phpgw_info']['flags']['app_header'] ?
$GLOBALS['phpgw_info']['flags']['app_header'] : ''
);
$tpl_vars['home_text'] = lang('home');
- $tpl_vars['home_url'] = 'home.php';
+ $tpl_vars['home_url'] = $GLOBALS['phpgw']->link('/home.php');
$tpl_vars['logout_text'] = lang('logout');
- $tpl_vars['logout_url'] = 'logout.php';
+ $tpl_vars['logout_url'] = $GLOBALS['phpgw']->link('/logout.php');
$GLOBALS['phpgw']->template->set_var($tpl_vars);
Modified: branches/Version-1_0-branch/phpgwapi/templates/mobilefrontend/head.tpl
===================================================================
--- branches/Version-1_0-branch/phpgwapi/templates/mobilefrontend/head.tpl
2013-04-12 13:55:58 UTC (rev 11059)
+++ branches/Version-1_0-branch/phpgwapi/templates/mobilefrontend/head.tpl
2013-04-15 10:26:27 UTC (rev 11060)
@@ -36,9 +36,12 @@
<a href="{home_url}">{home_text}</a>
<a href="{logout_url}">{logout_text}</a>
</div>
+ <div id="app_header">{current_app_header}</div>
<!--<div id="logo"> </div>
<div id="centerimage"></div>-->
</div>
<div class="yui-skin-sam" id='frontend'>
<div id="line"></div>
<div style='margin:0; padding: 0; line-height:
0'> </div>
+
+
Modified:
branches/Version-1_0-branch/phpgwapi/templates/mobilefrontend/navbar.inc.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/templates/mobilefrontend/navbar.inc.php
2013-04-12 13:55:58 UTC (rev 11059)
+++
branches/Version-1_0-branch/phpgwapi/templates/mobilefrontend/navbar.inc.php
2013-04-15 10:26:27 UTC (rev 11060)
@@ -2,14 +2,10 @@
function parse_navbar($force = False)
{
- $navbar = array();
-// if(!isset($GLOBALS['phpgw_info']['flags']['nonavbar']) ||
!$GLOBALS['phpgw_info']['flags']['nonavbar'])
- {
- $navbar = execMethod('phpgwapi.menu.get', 'navbar');
- }
$user = $GLOBALS['phpgw']->accounts->get(
$GLOBALS['phpgw_info']['user']['id'] );
+/*
$var = array
(
'home_url' =>
$GLOBALS['phpgw']->link('/home.php'),
@@ -22,6 +18,38 @@
'user_fullname' => $user->__toString()
);
+*/
+
+ if(!isset($GLOBALS['phpgw_info']['flags']['nonavbar']) ||
!$GLOBALS['phpgw_info']['flags']['nonavbar'])
+ {
+ $currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
+ $applications = '';
+ $exclude = array('home', 'about', 'logout');
+ $navbar = execMethod('phpgwapi.menu.get', 'navbar');
+ prepare_navbar($navbar);
+ foreach ( $navbar as $app => $app_data )
+ {
+ if ( in_array($app, $exclude) )
+ {
+ continue;
+ }
+ if ( $app == $currentapp)
+ {
+ $app_data['text'] =
"[<b>{$app_data['text']}</b>]";
+ }
+
+ $applications .= <<<HTML
+ <a
href="{$app_data['url']}">{$app_data['text']}</a>
+HTML;
+ }
+
+ $var['applications'] = $applications;
+
+ $menu_array =
execMethod('phpgwapi.menu.get_local_menu', $currentapp);
+ $var['app_menu'] =
phpgwapi_menu::render_horisontal_menu($menu_array);
+ }
+
+/*
if ( $GLOBALS['phpgw']->acl->check('run', PHPGW_ACL_READ,
'preferences') )
{
$var['preferences_url'] =
$GLOBALS['phpgw']->link('/preferences/index.php');
@@ -54,14 +82,22 @@
$var['debug_text'] = lang('debug');
$var['debug_icon'] = 'icon icon-debug';
}
-
+*/
$GLOBALS['phpgw']->template->set_root(PHPGW_TEMPLATE_DIR);
$GLOBALS['phpgw']->template->set_file('navbar', 'navbar.tpl');
$flags = &$GLOBALS['phpgw_info']['flags'];
$var['current_app_title'] = isset($flags['app_header']) ?
$flags['app_header'] : lang($GLOBALS['phpgw_info']['flags']['currentapp']);
$flags['menu_selection'] = isset($flags['menu_selection']) ?
$flags['menu_selection'] : '';
+//
+ $controller_url = $GLOBALS['phpgw']->link( '/index.php',
array('menuaction' => 'controller.uicontrol.control_list') );
+ $controller_text = lang('controller');
+ $tts_url = $GLOBALS['phpgw']->link( '/index.php', array('menuaction' =>
'property.uitts.index') );
+ $tts_text = lang('ticket');
+
+//
+
$GLOBALS['phpgw']->template->set_var($var);
$GLOBALS['phpgw']->template->pfp('out','navbar');
Modified:
branches/Version-1_0-branch/phpgwapi/templates/mobilefrontend/navbar.tpl
===================================================================
--- branches/Version-1_0-branch/phpgwapi/templates/mobilefrontend/navbar.tpl
2013-04-12 13:55:58 UTC (rev 11059)
+++ branches/Version-1_0-branch/phpgwapi/templates/mobilefrontend/navbar.tpl
2013-04-15 10:26:27 UTC (rev 11060)
@@ -1 +1,5 @@
-
\ No newline at end of file
+<!-- BEGIN navbar -->
+ <div id="applications">{applications}</div>
+ <div id="app-menu">{app_menu}</div>
+<!-- END navbar -->
+
Modified: branches/Version-1_0-branch/phpgwapi/templates/verdilak/css/styles.css
===================================================================
--- branches/Version-1_0-branch/phpgwapi/templates/verdilak/css/styles.css
2013-04-12 13:55:58 UTC (rev 11059)
+++ branches/Version-1_0-branch/phpgwapi/templates/verdilak/css/styles.css
2013-04-15 10:26:27 UTC (rev 11060)
@@ -12,6 +12,17 @@
padding: 0;
}
+
+#app-menu{
+margin: 0 0 0 16px !important;
+}
+
+#app-menu a{
+border-right: 1px solid #575757;
+padding: 0 0.5em;
+line-height: 1.2em;
+}
+
img, input[type=image]
{
border: 0;
Modified: branches/Version-1_0-branch/phpgwapi/templates/verdilak/navbar.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/templates/verdilak/navbar.inc.php
2013-04-12 13:55:58 UTC (rev 11059)
+++ branches/Version-1_0-branch/phpgwapi/templates/verdilak/navbar.inc.php
2013-04-15 10:26:27 UTC (rev 11060)
@@ -25,6 +25,7 @@
$tpl->set_block('navbartpl','navbar');
$var['img_root'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] .
'/phpgwapi/templates/verdilak/images';
+ $currentapp = $GLOBALS['phpgw_info']['flags']['currentapp'];
$applications = '';
$exclude = array('home', 'preferences', 'about', 'logout');
$navbar = execMethod('phpgwapi.menu.get', 'navbar');
@@ -35,6 +36,16 @@
{
continue;
}
+ if ( $app == $currentapp)
+ {
+ $app_data['text'] =
"[<b>{$app_data['text']}</b>]";
+ }
+
+ $applications .= <<<HTML
+ <br>
+ <a
href="{$app_data['url']}">{$app_data['text']}</a>
+HTML;
+/*
$icon =
$GLOBALS['phpgw']->common->image($app_data['image'][0], $app_data['image'][1]);
$applications .= <<<HTML
<br>
@@ -43,10 +54,11 @@
</a>
HTML;
+*/
}
- $app = $GLOBALS['phpgw_info']['flags']['currentapp'];
- $menu_array = execMethod('phpgwapi.menu.get_local_menu', $app);
+
+ $menu_array = execMethod('phpgwapi.menu.get_local_menu',
$currentapp);
$var['app_menu'] =
phpgwapi_menu::render_horisontal_menu($menu_array);
$var['applications'] = $applications;
Modified: branches/Version-1_0-branch/phpgwapi/templates/verdilak/navbar.tpl
===================================================================
--- branches/Version-1_0-branch/phpgwapi/templates/verdilak/navbar.tpl
2013-04-12 13:55:58 UTC (rev 11059)
+++ branches/Version-1_0-branch/phpgwapi/templates/verdilak/navbar.tpl
2013-04-15 10:26:27 UTC (rev 11060)
@@ -26,7 +26,7 @@
<table border="0" cellpadding="5" width="100%">
<tr>
<td id="phpgw_body">
- {app_menu}
+ <div id="app-menu">{app_menu}</div>
<!-- END navbar -->
<!-- BEGIN preferences --><a href="{preferences_url}"><img
src="{preferences_img}" border="0" alt="{preferences_text}"></a><!-- END
preferences -->
Modified: branches/Version-1_0-branch/property/inc/class.solocation.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.solocation.inc.php
2013-04-12 13:55:58 UTC (rev 11059)
+++ branches/Version-1_0-branch/property/inc/class.solocation.inc.php
2013-04-15 10:26:27 UTC (rev 11060)
@@ -1610,7 +1610,7 @@
$type_id=4;
}
- $entity_table = 'fm_location' . $type_id ;
+ $entity_table = "fm_location{$type_id}";
$cols_return = array();
$paranthesis = '';
@@ -1663,29 +1663,50 @@
$uicols['descr'][] = lang('number');
$uicols['input_type'][] = 'text';
- $joinmethod= "$this->join $entity_table"."_category on
$entity_table.category=$entity_table"."_category.id";
+ $this->uicols = $uicols;
- $sql =
$this->bocommon->generate_sql(array('entity_table'=>$entity_table,'cols_return'=>$cols_return,'cols'=>$cols,
-
'uicols'=>$uicols,'joinmethod'=>$joinmethod,'paranthesis'=>$paranthesis,'no_address'=>true,'location_level'=>$type_id));
+ $joinmethod = "{$this->join} fm_part_of_town ON
(fm_location1.part_of_town_id = fm_part_of_town.part_of_town_id))";
+ $paranthesis .='(';
+ $joinmethod .= " {$this->join} fm_owner ON
(fm_location1.owner_id = fm_owner.id))";
+ $paranthesis .='(';
- $sql = str_replace(',fm_location1.loc1_name', '', $sql);
+ $_level = 2;
+ for ($i=1; $i<$type_id; $i++)
+ {
+ $joinmethod .= " {$this->join}
fm_location{$_level}";
+ $paranthesis .='(';
+ $on = 'ON';
+ for ($k=($_level-1); $k>0; $k--)
+ {
+ $joinmethod .= " $on
(fm_location{$_level}.loc{$k} = fm_location" . ($_level-1) . ".loc{$k})";
+ $on = 'AND';
+ if($k==1)
+ {
+ $joinmethod .= ")";
+ }
+ }
+ $_level ++;
+ }
+ $joinmethod.= " {$this->join} {$entity_table}_category
ON ($entity_table.category = {$entity_table}_category.id))";
+ $paranthesis .='(';
+
+ $sql = "SELECT $cols FROM $paranthesis fm_location1
$joinmethod";
+
$this->db->query($sql . $filtermethod . $groupmethod .
" ORDER BY $entity_table.category",__LINE__,__FILE__);
$summary = array();
while ($this->db->next_record())
{
$summary[]=array
- (
- 'number' =>
$this->db->f('number'),
- 'type' => '['
. $this->db->f('category') . '] ' .$this->db->f('type'),
- 'part_of_town' =>
$this->db->f('part_of_town'),
- 'district_id' =>
$this->db->f('district_id')
- );
+ (
+ 'number' =>
$this->db->f('number'),
+ 'type' => '[' .
$this->db->f('category') . '] ' .$this->db->f('type'),
+ 'part_of_town' =>
$this->db->f('part_of_town'),
+ 'district_id' =>
$this->db->f('district_id')
+ );
}
-
- $this->uicols = $uicols;
return $summary;
}
Modified: branches/Version-1_0-branch/property/inc/class.uitts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uitts.inc.php
2013-04-12 13:55:58 UTC (rev 11059)
+++ branches/Version-1_0-branch/property/inc/class.uitts.inc.php
2013-04-15 10:26:27 UTC (rev 11060)
@@ -446,7 +446,7 @@
if( phpgw::get_var('phpgw_return_as') != 'json' )
{
- $datatable['menu']
= $this->bocommon->get_menu();
+// $datatable['menu']
= $this->bocommon->get_menu();
$datatable['config']['base_url'] =
$GLOBALS['phpgw']->link('/index.php', array
(
'menuaction' =>
'property.uitts.index',
@@ -1357,6 +1357,7 @@
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('property') . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->js->validate_file( 'yahoo',
$this->simple ? 'tts.index.simple' : 'tts.index' , 'property' );
+
}
function index2()
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11060] Merge 11054:11059 from trunk,
Sigurd Nes <=