[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7362] Merge 7354:7361 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [7362] Merge 7354:7361 from trunk |
|
Date: |
Tue, 07 Jun 2011 21:41:26 +0000 |
Revision: 7362
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7362
Author: sigurdne
Date: 2011-06-07 21:41:26 +0000 (Tue, 07 Jun 2011)
Log Message:
-----------
Merge 7354:7361 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/activitycalendarfrontend/inc/class.uiactivity.inc.php
branches/Version-1_0-branch/activitycalendarfrontend/setup/phpgw_no.lang
branches/Version-1_0-branch/frontend/inc/class.uifrontend.inc.php
branches/Version-1_0-branch/frontend/templates/base/base.css
branches/Version-1_0-branch/property/inc/class.uitts.inc.php
branches/Version-1_0-branch/property/inc/hook_settings.inc.php
branches/Version-1_0-branch/property/templates/base/tts.xsl
branches/Version-1_0-branch/rental/inc/class.uicontract.inc.php
branches/Version-1_0-branch/rental/inc/hook_config.inc.php
branches/Version-1_0-branch/rental/setup/phpgw_no.lang
branches/Version-1_0-branch/rental/templates/base/config.tpl
Added Paths:
-----------
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/base.css
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
+
/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
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/inc/class.uiactivity.inc.php
===================================================================
---
branches/Version-1_0-branch/activitycalendarfrontend/inc/class.uiactivity.inc.php
2011-06-07 20:55:00 UTC (rev 7361)
+++
branches/Version-1_0-branch/activitycalendarfrontend/inc/class.uiactivity.inc.php
2011-06-07 21:41:26 UTC (rev 7362)
@@ -14,6 +14,14 @@
'index' => true
);
+ /**
+ * Public method. Forwards the user to edit mode.
+ */
+ public function add()
+ {
+ $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'activitycalendarfrontend.uiactivity.edit', 'action' =>
'new_activity'));
+ }
+
function view()
{
$errorMsgs = array();
@@ -31,24 +39,24 @@
'errorMsgs' => $errorMsgs,
'infoMsgs' => $infoMsgs
);
+
+ $GLOBALS['phpgw_info']['flags']['noframework'] = true;
$this->render('activity.php', $data);
}
function edit()
{
$id = intval(phpgw::get_var('id', 'GET'));
+ $action = phpgw::get_var('action', 'GET');
//var_dump($id);
- $so = activitycalendar_soactivity::get_instance();
- $activity = $so->get_single($id);
+ $so_activity =
activitycalendar_soactivity::get_instance();
+ //$activity = $so->get_single($id);
//var_dump(phpgw::get_var('secret', 'GET'));
//var_dump($activity->get_secret());
- if($activity->get_secret() != phpgw::get_var('secret',
'GET'))
- {
- $this->redirect(array('menuaction' =>
'bookingfrontend.uisearch.index'));
- }
+
//var_dump($activity->get_title());
//$this->redirect(array('menuaction' =>
'activitycalendar.uiactivities.edit', 'id' => $id, 'frontend' => 'true'));
@@ -59,13 +67,97 @@
$audience = $audience['results'];
self::render_template('application',
array('application' => $application, 'audience' => $audience, 'agegroups' =>
$agegroups, 'frontend'=>'true'));
*/
- $categories = $so->get_categories();
- $targets = $so->get_targets();
- $offices = $so->select_district_list();
- $districts = $so->get_districts();
+ $categories = $so_activity->get_categories();
+ $targets = $so_activity->get_targets();
+ $offices = $so_activity->select_district_list();
+ $districts = $so_activity->get_districts();
$arenas =
activitycalendar_soarena::get_instance()->get(null, null, null, null, null,
null, null);
$organizations =
activitycalendar_soorganization::get_instance()->get(null, null, null, null,
null, null, null);
$groups =
activitycalendar_sogroup::get_instance()->get(null, null, null, null, null,
null, null);
+
+ // Retrieve the activity object or create a new one
+ if(isset($id) && $id > 0)
+ {
+ $activity = $so_activity->get_single($id);
+ }
+ else
+ {
+ $activity = new activitycalendar_activity();
+ }
+
+ if($activity->get_secret() != phpgw::get_var('secret',
'GET'))
+ {
+ if($action != 'new_activity')
+ {
+ $this->redirect(array('menuaction' =>
'bookingfrontend.uisearch.index'));
+ }
+ }
+
+ $g_id = phpgw::get_var('group_id');
+ $o_id = phpgw::get_var('organization_id');
+ if(isset($g_id) && $g_id > 0)
+ {
+ $persons =
activitycalendar_sogroup::get_instance()->get_contacts($g_id);
+ $desc =
activitycalendar_sogroup::get_instance()->get_description($g_id);
+ }
+ else if(isset($o_id) && $o_id > 0)
+ {
+ $persons =
activitycalendar_soorganization::get_instance()->get_contacts($o_id);
+ $desc =
activitycalendar_soorganization::get_instance()->get_description($o_id);
+ }
+
+ if(isset($_POST['save_activity'])) // The user has
pressed the save button
+ {
+ if(isset($activity)) // If an activity object
is created
+ {
+ $old_state = $activity->get_state();
+ $new_state = phpgw::get_var('state');
+
+ // ... set all parameters
+
$activity->set_title(phpgw::get_var('title'));
+
$activity->set_organization_id(phpgw::get_var('organization_id'));
+
$activity->set_group_id(phpgw::get_var('group_id'));
+
$activity->set_arena(phpgw::get_var('arena_id'));
+ $district_array =
phpgw::get_var('district');
+ $activity->set_district(implode(",",
$district_array));
+
$activity->set_office(phpgw::get_var('office'));
+ $activity->set_state($new_state);
+
$activity->set_category(phpgw::get_var('category'));
+ $target_array =
phpgw::get_var('target');
+ $activity->set_target(implode(",",
$target_array));
+ $activity->set_description($desc);
+
$activity->set_time(phpgw::get_var('time'));
+
$activity->set_contact_persons($persons);
+
$activity->set_special_adaptation(phpgw::get_var('special_adaptation'));
+
+ if($so_activity->store($activity)) //
... and then try to store the object
+ {
+ $message =
lang('messages_saved_form');
+ }
+ else
+ {
+ $error =
lang('messages_form_error');
+ }
+
+ if($new_state == 3 || $new_state == 4
|| $new_state == 5 )
+ {
+ $kontor =
$so_activity->get_office_name($activity->get_office());
+ $subject = "Melding fra
AktivBy";
+ $body = lang('mail_body_state_'
. $new_state, $kontor);
+
+ if(isset($g_id) && $g_id > 0)
+ {
+
activitycalendar_uiactivities::send_mailnotification_to_group($activity->get_contact_person_2(),$subject,$body);
+ }
+ else if (isset($o_id) && $o_id
> 0)
+ {
+
activitycalendar_uiactivities::send_mailnotification_to_organization($activity->get_contact_person_2(),$subject,$body);
+ }
+ }
+ }
+ }
+
+ $GLOBALS['phpgw_info']['flags']['noframework'] = true;
$this->render('activity.php', array
(
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/activitycalendarfrontend/setup/phpgw_no.lang
2011-06-07 20:55:00 UTC (rev 7361)
+++ branches/Version-1_0-branch/activitycalendarfrontend/setup/phpgw_no.lang
2011-06-07 21:41:26 UTC (rev 7362)
@@ -45,4 +45,5 @@
state_4 activitycalendarfrontend no Behandlet
state_5 activitycalendarfrontend no Avvist
district activitycalendarfrontend no Bydel
-title activitycalendarfrontend no Tittel
\ No newline at end of file
+title activitycalendarfrontend no Tittel
+activity_helptext activitycalendarfrontend no Før ny
aktivitet kan registreres må du sjekke at organisasjon/gruppe finnes og er
oppdatert, og at arena finnes og er oppdatert.
\ No newline at end of file
Copied:
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/base.css
(from rev 7361, trunk/activitycalendarfrontend/templates/base/base.css)
===================================================================
---
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/base.css
(rev 0)
+++
branches/Version-1_0-branch/activitycalendarfrontend/templates/base/base.css
2011-06-07 21:41:26 UTC (rev 7362)
@@ -0,0 +1,243 @@
address@hidden "UTF-8";
+
+dl.proplist,
+dl.proplist-col {
+ margin: 1em 0;
+ padding-left: 2em;
+}
+dl.proplist dt,
+dl.proplist-col dt {
+ font-style: italic;
+ font-weight: bolder;
+ font-size: 90%;
+ margin: .8em 0 .1em 0;
+}
+
+dl.proplist-col,
+dl.form-col {
+ width: 18em;
+ float: left;
+}
+
+
+table#header {
+ margin: 2em;
+
+ }
+
+div#unit_selector {
+
+}
+
+div#all_units_key_data {
+ padding-left: 2em;
+ }
+
+div#unit_image {
+ margin-left: 2em;
+ }
+
+div#unit_image img {
+ height:170px;
+}
+
+div.yui-navset {
+ padding-left: 2em;
+ padding-right: 2em;
+ }
+
+div#contract_selector {
+ padding-left: 1em;
+ padding-top: 1em;
+ }
+
+img.list_image {
+ margin-right: 5px;
+ float:left;
+ }
+
+a.list_image {
+ float:left;
+ display:inline;
+ }
+
+ol.list_image {
+ float: left;
+ }
+
+ol.list_image li {
+ padding: 1px;
+}
+
+dl#key_data {
+ padding: 2px;
+ }
+
+
+dl#key_data dd {
+ padding-bottom: 1em;
+}
+
+table#key_data td {
+ padding-right: 1em;
+ padding: 5px;
+ }
+
+
+.user_menu {
+ list-style:none;
+ height: 100%;
+ padding: 2px;
+ border-style: none none none solid;
+ border-width: 1px;
+ border-color: grey;
+ padding-left: 5px;
+}
+
+.user_menu li {
+ margin: 13px;
+ }
+
+#area_and_price {
+ list-style:none;
+ height: 100%;
+ padding: 2px;
+ padding-left: 5px;
+ float:right;
+ padding:0.5em 1em 0 0;
+}
+
+#area_and_price li {
+ margin: 13px;
+ }
+
+#org_units {
+ list-style: none;
+ height: 100%;
+ padding: 2px;
+ padding-left: 5px;
+ float:right;
+ padding:0.5em 1em 0 0;
+}
+
+#org_units li {
+ margin: 13px;
+ }
+
+#information {
+ list-style:none;
+ height: 100%;
+ padding: 2px;
+ padding-left: 5px;
+ float:right;
+ padding:0.5em 1em 0 0;
+}
+
+#information li {
+ margin: 13px;
+ }
+
+a.header_link {
+ text-decoration: none;
+ float: none;
+ }
+
+#logo_holder {
+ border: 0 none;
+ font-family:Arial,sans-serif;
+font-size:65%;
+line-height:1.166;
+position: absolute;
+padding:2em;
+}
+
+em#bold {
+ font-weight: bold;
+ }
+
+div#header a {
+ float: none;
+}
+
+.yui-skin-sam .yui-navset .yui-nav, .yui-skin-sam .yui-navset .yui-navset-top
.yui-nav {
+ border-color: #BF0005;
+ border-width:0 0 2px;
+ }
+
+.yui-skin-sam .yui-navset .yui-content {
+ background: none repeat scroll 0 0 #F4F2ED;
+}
+
+.yui-skin-sam .yui-navset .yui-nav .selected a, .yui-skin-sam .yui-navset
.yui-nav .selected a:focus, .yui-skin-sam .yui-navset .yui-nav .selected
a:hover {
+ background:url("../../../../assets/skins/sam/sprite.png") repeat-x
scroll left -1400px #2647A0;
+ }
+
+div.tickets {
+ margin-top: 1em;
+ }
+
+em.select_header {
+ font-size: larger;
+ padding-top: 10px;
+ }
+
+#contract_price_and_area {
+ float: left;
+ margin: 1em 2em 0 0;
+}
+
+#contract_price_and_area li {
+ margin-bottom: 1em;
+ }
+
+#contract_essentials {
+ float: left;
+ margin: 1em 2em 0 2em;
+ }
+
+#composites {
+ float: left;
+ margin: 1em 2em 0 2em;
+ }
+
+
+#comment {
+ float: left;
+ margin: 1em 2em 0 2em;
+ }
+
+ #contract_essentials li {
+ margin-bottom: 1em;
+ }
+
+#contract_parts {
+ float: left;
+ margin: 1em 2em 0 2em;
+ }
+
+div.toolbar {
+background-color:#EEEEEE;
+border:1px solid #BBBBBB;
+float:left;
+width:100%;
+}
+
+div.toolbar_manual {
+background-color:#EEEEEE;
+border:1px solid #BBBBBB;
+float:left;
+width:100%;
+}
+
+.yui-pg-container {
+ white-space: normal;
+ }
+
+li.ticket_detail {
+ padding: 5px;
+ margin-left: 5px;
+ }
+
+
+
+
Modified: branches/Version-1_0-branch/frontend/inc/class.uifrontend.inc.php
===================================================================
--- branches/Version-1_0-branch/frontend/inc/class.uifrontend.inc.php
2011-06-07 20:55:00 UTC (rev 7361)
+++ branches/Version-1_0-branch/frontend/inc/class.uifrontend.inc.php
2011-06-07 21:41:26 UTC (rev 7362)
@@ -258,8 +258,6 @@
phpgwapi_cache::session_set('frontend', 'header_state',
$this->header_state);
-
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/templates/bkbooking/css/frontend.css');
-
$GLOBALS['phpgw']->css->add_external_file('frontend/templates/base/base.css');
$GLOBALS['phpgw_info']['flags']['noframework'] = true;
}
Modified: branches/Version-1_0-branch/frontend/templates/base/base.css
===================================================================
--- branches/Version-1_0-branch/frontend/templates/base/base.css
2011-06-07 20:55:00 UTC (rev 7361)
+++ branches/Version-1_0-branch/frontend/templates/base/base.css
2011-06-07 21:41:26 UTC (rev 7362)
@@ -1,5 +1,282 @@
@CHARSET "UTF-8";
+body {
+ font: normal small verdana,sans-serif;
+ margin: 0;
+ text-align: left;
+ background: white;
+}
+button { padding: .3em .6em; margin: .4em 0;}
+a:link, a:visited { color: black;}
+div#wrapper {}
+ul#metanav {
+ float: right;
+ list-style-type: none;
+ padding-top: 10px;
+}
+ul#metanav a, ul#sidebar a { color: #700; }
+div#content {
+ margin: 0 2em;
+ min-height: 500px;
+}
+#header-search {
+ float: right;
+ margin: -1.5em 1em 1em 1em;
+}
+#header-search.hidden { display: none; }
+#header-search .query { width: 15em;}
+div#header {
+ background: url(../images/header_bg.png) repeat-x;
+ height: 129px;
+}
+div#header a {
+ float: left;
+}
+div#logo {
+ width: 125px;
+ height: 114px;
+ margin-left: 10px;
+}
+div#centerimage {
+ background: url(../images/header_fg.png) no-repeat;
+ background-position: bottom center;
+ margin: 0 auto;
+ padding-top: 4px;
+ height: 109px;
+ overflow: hidden;
+}
+div#footer {
+ border-top: 1px solid #aaa;
+ padding-top: .3em;
+ color: #666;
+ font-size: 90%;
+}
+ul.nav {
+ list-style-type: 0;
+ padding-left: 0;
+}
+div.clr {clear: both;}
+ul.nav a { color: inherit; }
+ul.nav li { display: inline;}
+ul.nav li:before { content: '⇒ '; font-size: 90%; color: #444;}
+ul.nav li:first-child:before { display: none; }
+#login-bar {
+ clear: right;
+ float: right;
+ padding: .5em 1em 0 0;
+}
+form#search {
+ text-align: center;
+ padding-top: 5em;
+}
+input#search {
+ font-size: 120%;
+ color: #666;
+ width: 20em;
+}
+div.hint {
+ margin-top: 0.4em;
+ font-size: 90%;
+ color: #444;
+}
+div.hint i { color: #383;}
+
+ol#result {
+ padding-left: 0;
+}
+ol#result dl { margin: 0; }
+
+ol#result .header {
+ font-size: 120%;
+ background-color: #eee;
+ border-top: 1px solid #ccc;
+ border-bottom: 1px solid #ccc;
+ padding: .1em 0em .25em .2em;
+ margin-top: .5em;
+}
+ol#result .details {
+}
+ol#result .details h4 {
+ margin: 0.2em 0 0 0;
+ font-weight: normal;
+ font-style: italic;
+ color: #888;
+}
+ol#result .details .col {
+ padding: 0em 0.2em 0.4em 0.2em;
+ /*float: left;*/
+ width: 50%;
+ /*border: 1px solid #eee;*/
+}
+ol#result .details .moreInfo {
+ margin-top: .4em;
+}
+
+ol#result li:last-child {
+ border-bottom: 1px solid #ccc;
+}
+
+dl.form {}
+
+dl.form dt {
+ font-style: italic;
+ font-weight: bolder;
+ margin: .5em 0 .1em 0;
+ color: #002;
+}
+
+dl.form dt label { font-size: 90%; color: #733; font-style: italic;}
+dl.form dd {
+ float: left;
+ margin: 0 0 0 .4em;
+}
+table.fancyTable {
+ border-spacing: 0;
+ border: 1px solid #ccc;
+}
+table.fancyTable thead th {
+ font-weight: normal;
+ border-bottom: 1px solid #777;
+ padding: .1em .3em;
+ font-size: 85%;
+ font-style: italic;
+ color: #744;
+}
+table.fancyTable tbody td {
+ padding: .2em .7em;
+ border-bottom: 1px solid white;
+}
+table.fancyTable tbody tr:hover td {
+ background: #ffe;
+ border-bottom-color: #cca;
+}
+table.fancyTable tbody td.godkand { color: #474; }
+table.fancyTable tbody td.avslag { color: #744; }
+table.fancyTable tbody td.inskickad { color: #447; }
+table.fancyTable tbody td.ny { color: #447; }
+table.fancyTable tbody td a{ color: inherit; text-decoration: inherit;}
+
+div#help {
+ width: 15em;
+ float: right;
+ background: #3287d8;
+ border: 1px solid #66a;
+ border-radius: .6em;
+ -moz-border-radius: .6em;
+ -webkit-border-radius: .6em;
+ color: white;
+}
+div#help dl { margin: .2em .8em; min-height: 10em;}
+div#help dl dd { font-style: italic;}
+div#help h2 {
+ margin: 0;
+ font-size: 80%;
+ padding: .1em .5em;
+ font-weight: normal;
+ border-bottom: 1px solid #67b1ff;
+}
+#weekView tr.time td { border-top: 1px solid #aaa;}
+#weekView tr td:first-child { background: #ddd;}
+
+
+#cloud {
+ text-align: center;
+ list-style-type: none;
+ padding-left: 0;
+ color: #888;
+ margin: 3em 0;
+ font-size: 120%;
+}
+#cloud div { padding: .2em};
+#cloud strong { padding: .2em};
+
+#cloud li { display: inline; white-space: nowrap; padding: 0 .2em;}
+#cloud li.small { font-size: 100%;}
+#cloud li.medium { font-size: 130%;}
+#cloud li.large { font-size: 200%; color: #777;}
+#cloud li.xlarge { font-size: 240%; color: #555;}
+#cloud li:hover { text-decoration: underline; cursor: pointer; }
+
+dl.tooltip { width: 300px;}
+
+dl.tooltip dt {
+ float: left;
+ clear: left;
+ width: 7em;
+ font-style: italic;
+}
+
+dl.tooltip dd {
+ float: left;
+}
+
+div.info:hover {
+ background-image: url(../images/info.png);
+ background-repeat: no-repeat;
+ background-position: 100% 0%;
+}
+
+dl.contactinfo {}
+dl.contactinfo dt {
+ margin-left: 1em;
+}
+dl.contactinfo dd {
+ margin-left: 2em;
+}
+
+/*#frontend {
+ width: 900px;
+}*/
+
+#frontend dl.proplist-col {
+ width: 300px;
+}
+
+#frontend dl.proplist-col.main {
+ width: 400px;
+}
+
+#frontend dl.proplist-col.images {
+ float:right;
+ clear:right;
+}
+
+
+
+#frontend h2 { margin-bottom: 0.1em;}
+#frontend dl.proplist.images dd img { width: 300px; border:1px solid #777;
padding: 1px;}
+#frontend dl.proplist.images dl { margin-bottom: 1.5em; }
+
+#frontend #result dl.proplist.images dt { display: none;}
+#frontend #result dl.proplist.images dd { display: inline; padding-right: 1em;}
+#frontend #result dl.proplist.images dd img { width: auto; height: 120px;
border:1px solid black;}
+
+
+#agegroup {
+ background: #eee;
+ white-space: nowrap;
+}
+#agegroup, #agegroup td, #agegroup th { width: 1%; }
+#agegroup td, #agegroup th { padding: .1em .3em;}
+#agegroup td input { width: 3em; }
+
+#overlay-info { padding: 1em; }
+#overlay-info h3 { margin: 0 0 .9em 0; }
+#overlay-info dt { font-style: italic; font-weight: bolder; font-size: 90%;}
+#overlay-info dd { padding-left: 2em; }
+#overlay-info .close { float: right; }
+#overlay-info .actions { margin-top: 1em;}
+
+.yui-calendar td.calcell {
+ border:0px !important;
+}
+.yui-skin-sam .yui-dt TABLE TH{
+ border: none !important;
+}
+.yui-skin-sam .yui-dt TABLE TD{
+ border: none !important;
+}
+
dl.proplist,
dl.proplist-col {
margin: 1em 0;
Modified: branches/Version-1_0-branch/property/inc/class.uitts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uitts.inc.php
2011-06-07 20:55:00 UTC (rev 7361)
+++ branches/Version-1_0-branch/property/inc/class.uitts.inc.php
2011-06-07 21:41:26 UTC (rev 7362)
@@ -759,8 +759,11 @@
'onchange'=> 'onChangeSelect("building_part");',
'tab_index' => 15
);
-
$datatable['actions']['form'][0]['fields']['field'][] = array
- (
+
+ if (
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['tts_branch_list'])
&&
$GLOBALS['phpgw_info']['user']['preferences']['property']['tts_branch_list']==1)
+ {
+
$datatable['actions']['form'][0]['fields']['field'][] = array
+ (
'id' =>
'sel_branch_id', // testing traditional listbox for long list
'name'
=> 'branch_id',
'value'
=> lang('branch'),
@@ -769,7 +772,9 @@
'values' => $this->bo->get_branch($this->branch_id),
'onchange'=> 'onChangeSelect("branch_id");',
'tab_index' => 16
- );
+ );
+ }
+
$datatable['actions']['form'][0]['fields']['field'][] = array
(
'id' =>
'sel_order_dim1', // testing traditional listbox for long list
@@ -2541,11 +2546,18 @@
// -------- start order section
- if($access_order)
+ if($order_read || $access_order)
{
$vendor_data=$this->bocommon->initiate_ui_vendorlookup(array(
'vendor_id' =>
$ticket['vendor_id'],
- 'vendor_name' =>
$ticket['vendor_name']));
+ 'vendor_name' =>
$ticket['vendor_name'],
+ 'type' =>
$order_read && !$access_order ? 'view' : 'form'
+ ));
+
+ }
+
+ if($access_order)
+ {
$b_account_data=$this->bocommon->initiate_ui_budget_account_lookup(array
(
@@ -3092,7 +3104,7 @@
'order_cat_list'
=> $order_catetory,
'building_part_list'
=> array('options' => $this->bocommon->select_category_list(array('type'=>
'building_part','selected' =>$ticket['building_part'], 'order' => 'id',
'id_in_name' => 'num' ))),
'order_dim1_list'
=> array('options' =>
$this->bocommon->select_category_list(array('type'=> 'order_dim1','selected'
=>$ticket['order_dim1'], 'order' => 'id', 'id_in_name' => 'num' ))),
- 'branch_list'
=> array('options' =>
execMethod('property.boproject.select_branch_list', $values['branch_id'])),
+ 'branch_list'
=>
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['tts_branch_list'])
&&
$GLOBALS['phpgw_info']['user']['preferences']['property']['tts_branch_list']==1
? array('options' => execMethod('property.boproject.select_branch_list',
$values['branch_id'])) :'',
);
//---datatable settings--------------------
Modified: branches/Version-1_0-branch/property/inc/hook_settings.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/hook_settings.inc.php
2011-06-07 20:55:00 UTC (rev 7361)
+++ branches/Version-1_0-branch/property/inc/hook_settings.inc.php
2011-06-07 21:41:26 UTC (rev 7362)
@@ -278,6 +278,8 @@
}
}
+
+ create_select_box('branch TTS','tts_branch_list',$yes_and_no,'enable
branch in TTS-orders');
create_select_box('Default vendor
type','default_vendor_category',$_categories_vendor,'which agreement');
create_input_box('With of textarea','textareacols','With of textarea in
forms');
create_input_box('Height of textarea','textarearows','Height of
textarea in forms');
Modified: branches/Version-1_0-branch/property/templates/base/tts.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/tts.xsl 2011-06-07
20:55:00 UTC (rev 7361)
+++ branches/Version-1_0-branch/property/templates/base/tts.xsl 2011-06-07
21:41:26 UTC (rev 7362)
@@ -1207,24 +1207,28 @@
</select>
</td>
</tr>
+ <xsl:choose>
+ <xsl:when
test="branch_list!=''">
+ <tr>
+
<td>
+
<xsl:value-of select="php:function('lang', 'branch')" />
+
</td>
+
<td>
+
<select name="values[branch_id]" >
+
<xsl:attribute name="title">
+
<xsl:value-of select="php:function('lang', 'select
branch')" />
+
</xsl:attribute>
+
<option value="0">
+
<xsl:value-of select="php:function('lang', 'select
branch')" />
+
</option>
+
<xsl:apply-templates select="branch_list/options"/>
+
</select>
+
</td>
+ </tr>
+ </xsl:when>
+ </xsl:choose>
<tr>
<td>
-
<xsl:value-of select="php:function('lang', 'branch')" />
- </td>
- <td>
- <select
name="values[branch_id]" >
-
<xsl:attribute name="title">
-
<xsl:value-of select="php:function('lang', 'select branch')" />
-
</xsl:attribute>
-
<option value="0">
-
<xsl:value-of select="php:function('lang', 'select branch')" />
-
</option>
-
<xsl:apply-templates select="branch_list/options"/>
-
</select>
- </td>
- </tr>
- <tr>
- <td>
<xsl:value-of select="php:function('lang', 'order_dim1')" />
</td>
<td>
@@ -1353,6 +1357,21 @@
</xsl:when>
</xsl:choose>
</xsl:when>
+ <xsl:otherwise>
+ <xsl:choose>
+ <xsl:when test="value_order_id!=''">
+ <tr class="th">
+ <td class="th_text">
+ <xsl:value-of
select="php:function('lang', 'order id')" />
+ </td>
+ <td>
+ <xsl:value-of
select="value_order_id"/>
+ </td>
+ </tr>
+ <xsl:call-template
name="vendor_view"/>
+ </xsl:when>
+ </xsl:choose>
+ </xsl:otherwise>
</xsl:choose>
</table>
</div>
Modified: branches/Version-1_0-branch/rental/inc/class.uicontract.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/class.uicontract.inc.php
2011-06-07 20:55:00 UTC (rev 7361)
+++ branches/Version-1_0-branch/rental/inc/class.uicontract.inc.php
2011-06-07 21:41:26 UTC (rev 7362)
@@ -211,12 +211,13 @@
if($access)
{
$config->read();
- $entity_id =
$config->config_data['entity_config_move_in_out'];
+ $entity_id_in =
$config->config_data['entity_config_move_in'];
+ $entity_id_out =
$config->config_data['entity_config_move_out'];
$category_id_in =
$config->config_data['category_config_move_in'];
$category_id_out =
$config->config_data['category_config_move_out'];
}
- array_walk($rows, array($this, 'add_actions'),
array($type,$ids,$adjustment_id,$entity_id,$category_id_in,$category_id_out));
+ array_walk($rows, array($this, 'add_actions'),
array($type,$ids,$adjustment_id,$entity_id_in,$entity_id_out,$category_id_in,$category_id_out));
}
//var_dump("Usage " .memory_get_usage() . " bytes after
menu");
@@ -242,9 +243,10 @@
$type = $params[0];
$ids = $params[1];
$adjustment_id = $params[2];
- $entity_id = $params[3];
- $category_id_in = $params[4];
- $category_id_out = $params[5];
+ $entity_id_in = $params[3];
+ $entity_id_out = $params[4];
+ $category_id_in = $params[5];
+ $category_id_out = $params[6];
switch($type)
@@ -313,17 +315,17 @@
$temlate_counter++;
}
//http://portico/pe/index.php?menuaction=property.uientity.index&second_display=1&entity_id=3&cat_id=1&type=catch&district_id=0&query=Tes&start_date=&end_date=&click_history=06014d0abc7293bfb52ff5d1c04f3cb8&phpgw_return_as=json
- if(isset($entity_id) && $entity_id !=
'' && isset($category_id_in) && $category_id_in != '')
+ if(isset($entity_id_in) &&
$entity_id_in != '' && isset($category_id_in) && $category_id_in != '')
{
$value['ajax'][] = false;
- $value['actions'][] =
html_entity_decode(self::link(array('menuaction' => 'property.uientity.index',
'entity_id' => $entity_id, 'cat_id' => $category_id_in,'query' =>
$value['old_contract_id'], 'type' => 'catch')));
+ $value['actions'][] =
html_entity_decode(self::link(array('menuaction' => 'property.uientity.index',
'entity_id' => $entity_id_in, 'cat_id' => $category_id_in,'query' =>
$value['old_contract_id'], 'type' => 'catch')));
$value['labels'][] =
lang('show_move_in_reports');
}
- if(isset($entity_id) && $entity_id !=
'' && isset($category_id_out) && $category_id_out != '')
+ if(isset($entity_id_out) &&
$entity_id_out != '' && isset($category_id_out) && $category_id_out != '')
{
$value['ajax'][] = false;
- $value['actions'][] =
html_entity_decode(self::link(array('menuaction' => 'property.uientity.index',
'entity_id' => $entity_id, 'cat_id' => $category_id_out,'query' =>
$value['old_contract_id'], 'type' => 'catch')));
+ $value['actions'][] =
html_entity_decode(self::link(array('menuaction' => 'property.uientity.index',
'entity_id' => $entity_id_out, 'cat_id' => $category_id_out,'query' =>
$value['old_contract_id'], 'type' => 'catch')));
$value['labels'][] =
lang('show_move_out_reports');
}
}
Modified: branches/Version-1_0-branch/rental/inc/hook_config.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/hook_config.inc.php 2011-06-07
20:55:00 UTC (rev 7361)
+++ branches/Version-1_0-branch/rental/inc/hook_config.inc.php 2011-06-07
21:41:26 UTC (rev 7362)
@@ -48,14 +48,14 @@
return $out;
}
- function entity_config_move_in_out($config)
+ function entity_config_move_in($config)
{
if(isset($GLOBALS['phpgw_info']['apps']['catch']))
{
$entity =
CreateObject('property.soadmin_entity');
$entities = $entity->read(array('allrows' =>
true, 'type' => 'catch'));
- $selected_entity =
isset($config['entity_config_move_in_out']) ?
$config['entity_config_move_in_out'] : '';
- $out = '<select
name="newsettings[entity_config_move_in_out]">' . "\n";
+ $selected_entity =
isset($config['entity_config_move_in']) ? $config['entity_config_move_in'] : '';
+ $out = '<select
name="newsettings[entity_config_move_in]">' . "\n";
$out .= '<option value="">' . lang('none selected') .
'</option>' . "\n";
if ( is_array($entities) && count($entities) )
{
@@ -83,9 +83,44 @@
return $out;
}
+ function entity_config_move_out($config)
+ {
+ if(isset($GLOBALS['phpgw_info']['apps']['catch']))
+ {
+ $entity =
CreateObject('property.soadmin_entity');
+ $entities = $entity->read(array('allrows' =>
true, 'type' => 'catch'));
+ $selected_entity =
isset($config['entity_config_move_out']) ? $config['entity_config_move_out'] :
'';
+ $out = '<select
name="newsettings[entity_config_move_out]">' . "\n";
+ $out .= '<option value="">' . lang('none selected') .
'</option>' . "\n";
+ if ( is_array($entities) && count($entities) )
+ {
+ foreach($entities as $entry)
+ {
+
+ $id = $entry['id'];
+ $selected = '';
+ if ( $selected_entity == $id )
+ {
+ $selected = ' selected';
+ }
+
+ $out .= <<<HTML
+ <option
value="{$id}"{$selected}>{$entry['name']}</option>
+HTML;
+ }
+ }
+ $out .= ' </select>' . "\n";
+ }
+ else
+ {
+ $out = '<b>The catch-module is not installed</b>' .
"\n";
+ }
+ return $out;
+ }
+
function category_config_move_in($config)
{
- $selected_entity = isset($config['entity_config_move_in_out'])
? $config['entity_config_move_in_out'] : '';
+ $selected_entity = isset($config['entity_config_move_in']) ?
$config['entity_config_move_in'] : '';
$selected_category = isset($config['category_config_move_in'])
? $config['category_config_move_in'] : '';
$out = '<option value="">' . lang('none selected') .
'</option>' . "\n";
@@ -119,7 +154,7 @@
function category_config_move_out($config)
{
- $selected_entity = isset($config['entity_config_move_in_out'])
? $config['entity_config_move_in_out'] : '';
+ $selected_entity = isset($config['entity_config_move_out']) ?
$config['entity_config_move_out'] : '';
$selected_category = isset($config['category_config_move_out'])
? $config['category_config_move_out'] : '';
$out = '<option value="">' . lang('none selected') .
'</option>' . "\n";
Modified: branches/Version-1_0-branch/rental/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/rental/setup/phpgw_no.lang 2011-06-07
20:55:00 UTC (rev 7361)
+++ branches/Version-1_0-branch/rental/setup/phpgw_no.lang 2011-06-07
21:41:26 UTC (rev 7362)
@@ -197,7 +197,8 @@
email_create_user_based_on_email_title rental no Tilgang til Portico
Estate
email_create_user_based_on_email_message rental no Hei %1
%2:<br/>Det er opprettet en tilgang for deg i Portico
Estate<br/><br/>Brukernavnet er e-posten din<br/>Passordet er
%3<br/><br/>Systemet kan nås på adressen %4
ended rental no Avsluttet
-entity config move in out rental no Entitet for inn- og utflytting
+entity config move out rental no Entitet for utflytting
+entity config move in rental no Entitet for innflytting
error_create_user_based_on_email rental no En feil oppstod under
opprettelse av bruker
error_create_user_based_on_email_account_exist rental no En konto med
denne e-posten som brukernavn eksisterer allerede
error_create_user_based_on_email_not_valid_address rental no Kan
ikke opprette kontoen pga av e-postadressen ikke er gyldig
Modified: branches/Version-1_0-branch/rental/templates/base/config.tpl
===================================================================
--- branches/Version-1_0-branch/rental/templates/base/config.tpl
2011-06-07 20:55:00 UTC (rev 7361)
+++ branches/Version-1_0-branch/rental/templates/base/config.tpl
2011-06-07 21:41:26 UTC (rev 7362)
@@ -53,11 +53,12 @@
</td>
</tr>
<tr class="row_off">
- <td>{lang_entity_config_move_in_out}:</td>
+ <td>{lang_entity_config_move_in}:</td>
<td>
-{hook_entity_config_move_in_out}
+{hook_entity_config_move_in}
</td>
</tr>
+
<tr class="row_on">
<td>{lang_category_config_move_in}:</td>
<td>
@@ -66,6 +67,12 @@
</select>
</td>
</tr>
+ <tr class="row_off">
+ <td>{lang_entity_config_move_out}:</td>
+ <td>
+{hook_entity_config_move_out}
+ </td>
+ </tr>
<tr class="row_off">
<td>{lang_category_config_move_out}:</td>
<td>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7362] Merge 7354:7361 from trunk,
Sigurd Nes <=