[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7257] Merge 7251:7256 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [7257] Merge 7251:7256 from trunk |
|
Date: |
Wed, 04 May 2011 12:01:09 +0000 |
Revision: 7257
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7257
Author: sigurdne
Date: 2011-05-04 12:01:07 +0000 (Wed, 04 May 2011)
Log Message:
-----------
Merge 7251:7256 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
branches/Version-1_0-branch/activitycalendar/inc/class.uicommon.inc.php
branches/Version-1_0-branch/activitycalendar/inc/model/class.activity.inc.php
branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang
branches/Version-1_0-branch/activitycalendar/templates/base/activity.php
branches/Version-1_0-branch/activitycalendar/templates/base/activity_list.php
branches/Version-1_0-branch/activitycalendar/templates/base/activity_list_partial.php
branches/Version-1_0-branch/activitycalendar/templates/base/arena.php
branches/Version-1_0-branch/activitycalendar/templates/base/arena_list.php
branches/Version-1_0-branch/activitycalendar/templates/base/arena_list_partial.php
branches/Version-1_0-branch/activitycalendar/templates/base/organization_list.php
Added Paths:
-----------
branches/Version-1_0-branch/activitycalendar/templates/base/css/
branches/Version-1_0-branch/activitycalendar/templates/base/images/
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
+
/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
Modified:
branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
2011-05-04 11:33:52 UTC (rev 7256)
+++ branches/Version-1_0-branch/activitycalendar/inc/class.soactivity.inc.php
2011-05-04 12:01:07 UTC (rev 7257)
@@ -50,6 +50,8 @@
$dir = $ascending ? 'ASC' : 'DESC';
$order = "ORDER BY id $dir";
}
+ //var_dump($search_type);
+ //var_dump($search_for);
if($search_for)
{
$query = $this->marshal($search_for,'string');
@@ -77,16 +79,8 @@
$like_clauses[] =
"party.result_unit_number $this->like $like_pattern";
break;
case "all":
- $like_clauses[] = "party.first_name
$this->like $like_pattern";
- $like_clauses[] = "party.last_name
$this->like $like_pattern";
- $like_clauses[] = "party.company_name
$this->like $like_pattern";
- $like_clauses[] = "party.address_1
$this->like $like_pattern";
- $like_clauses[] = "party.address_2
$this->like $like_pattern";
- $like_clauses[] = "party.postal_code
$this->like $like_pattern";
- $like_clauses[] = "party.place
$this->like $like_pattern";
- $like_clauses[] = "party.identifier
$this->like $like_pattern";
- $like_clauses[] = "party.comment
$this->like $like_pattern";
- $like_clauses[] = "party.reskontro
$this->like $like_pattern";
+ default:
+ $like_clauses[] = "activity.title
$this->like $like_pattern";
break;
}
@@ -103,6 +97,14 @@
$id =
$this->marshal($filters[$this->get_id_field_name()],'int');
$filter_clauses[] = "activity.id = {$id}";
}
+ if(isset($filters['activity_state']) &&
$filters['activity_state'] != 'all'){
+ $activity_state =
$this->marshal($filters['activity_state'],'int');
+ $filter_clauses[] = "activity.state =
{$activity_state}";
+ }
+ if(isset($filters['activity_district']) &&
$filters['activity_district'] != 'all'){
+ $activity_district =
$this->marshal($filters['activity_district'],'int');
+ $filter_clauses[] = "activity.district =
'{$activity_district}'";
+ }
/*
// All parties with contracts of type X
if(isset($filters['party_type']))
@@ -133,7 +135,9 @@
$columns[] = 'activity.organization_id';
$columns[] = 'activity.group_id';
$columns[] = 'activity.district';
+ $columns[] = 'activity.state';
$columns[] = 'activity.category';
+ $columns[] = 'activity.target';
$columns[] = 'activity.description';
$columns[] = 'activity.arena';
$columns[] = 'activity.time';
@@ -199,7 +203,8 @@
'group_id = ' .
$this->marshal($activity->get_group_id(), 'int'),
'district = ' .
$this->marshal($activity->get_district(), 'int'),
'category = ' .
$this->marshal($activity->get_category(), 'int'),
- 'target = ' . $this->marshal($activity->get_target(),
'string'),
+ 'state = ' .
$this->marshal($activity->get_state(), 'int'),
+ 'target = ' . $this->marshal($activity->get_target(),
'int'),
'description = ' .
$this->marshal($activity->get_description(), 'string'),
'arena = ' .
$this->marshal($activity->get_arena(), 'int'),
'time = ' . $this->marshal($activity->get_time(),
'string'),
@@ -243,6 +248,8 @@
$activity->set_group_id($this->unmarshal($this->db->f('group_id'), 'int'));
$activity->set_district($this->unmarshal($this->db->f('district'), 'int'));
$activity->set_category($this->unmarshal($this->db->f('category'), 'int'));
+
$activity->set_state($this->unmarshal($this->db->f('state'), 'int'));
+
$activity->set_target($this->unmarshal($this->db->f('target'), 'int'));
$activity->set_description($this->unmarshal($this->db->f('description'),
'string'));
$activity->set_arena($this->unmarshal($this->db->f('arena'), 'string'));
$activity->set_time($this->unmarshal($this->db->f('time'), 'string'));
Modified:
branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
2011-05-04 11:33:52 UTC (rev 7256)
+++ branches/Version-1_0-branch/activitycalendar/inc/class.uiactivities.inc.php
2011-05-04 12:01:07 UTC (rev 7257)
@@ -108,6 +108,7 @@
$activity->set_group_id(phpgw::get_var('group_id'));
$activity->set_arena(phpgw::get_var('arena_id'));
$activity->set_district(phpgw::get_var('district'));
+ $activity->set_state(phpgw::get_var('state'));
$activity->set_category(phpgw::get_var('category'));
$activity->set_target(phpgw::get_var('target'));
$activity->set_description(phpgw::get_var('description'));
@@ -175,7 +176,8 @@
switch($query_type)
{
case 'all_activities':
- $filters = array();
+ default:
+ $filters = array('activity_state' =>
phpgw::get_var('activity_state'), 'activity_district' =>
phpgw::get_var('activity_district'));
$result_objects =
activitycalendar_soactivity::get_instance()->get($start_index, $num_of_objects,
$sort_field, $sort_ascending, $search_for, $search_type, $filters);
$object_count =
activitycalendar_soactivity::get_instance()->get_count($search_for,
$search_type, $filters);
break;
Modified:
branches/Version-1_0-branch/activitycalendar/inc/class.uicommon.inc.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/inc/class.uicommon.inc.php
2011-05-04 11:33:52 UTC (rev 7256)
+++ branches/Version-1_0-branch/activitycalendar/inc/class.uicommon.inc.php
2011-05-04 12:01:07 UTC (rev 7257)
@@ -2,6 +2,7 @@
phpgw::import_class('phpgwapi.yui');
define("ACTIVITYCALENDAR_TEMPLATE_PATH",
"activitycalendar/templates/base/");
+ define("ACTIVITYCALENDAR_IMAGE_PATH", "rental/templates/base/");
/**
Modified:
branches/Version-1_0-branch/activitycalendar/inc/model/class.activity.inc.php
===================================================================
---
branches/Version-1_0-branch/activitycalendar/inc/model/class.activity.inc.php
2011-05-04 11:33:52 UTC (rev 7256)
+++
branches/Version-1_0-branch/activitycalendar/inc/model/class.activity.inc.php
2011-05-04 12:01:07 UTC (rev 7257)
@@ -15,6 +15,7 @@
protected $group_id;
protected $district;
protected $category;
+ protected $state;
protected $target;
protected $description;
protected $arena;
@@ -211,8 +212,8 @@
'group_id' =>
activitycalendar_sogroup::get_instance()->get_group_name($this->get_group_id()),
'district' =>
activitycalendar_soactivity::get_instance()->get_district_name($this->get_district()),
'category' =>
$this->get_so()->get_category_name($this->get_category()),
+ 'state' => lang('state_'.$this->get_state()),
'description' => $this->get_description(),
- 'state' => $this->get_state(),
'arena' =>
activitycalendar_soarena::get_instance()->get_arena_name($this->get_arena()),
'time' => $this->get_time(),
'contact_person_1' => $contact_1,
Modified: branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang
2011-05-04 11:33:52 UTC (rev 7256)
+++ branches/Version-1_0-branch/activitycalendar/setup/phpgw_no.lang
2011-05-04 12:01:07 UTC (rev 7257)
@@ -330,7 +330,7 @@
description activitycalendar no Beskrivelse
date_start activitycalendar no Startdato
date_end activitycalendar no Sluttdato
-special_adaptation activitycalendar no Tilpasset
funksjonshemmede
+special_adaptation activitycalendar no Spesialtilpasset for
utviklingshemmede
target activitycalendar no Målgruppe
contact_person_1 activitycalendar no Kontaktperson 1
contact_person_2 activitycalendar no Kontaktperson 2
@@ -361,4 +361,11 @@
last_change_date activitycalendar no Sist endret
first activitycalendar no Første
last activitycalendar no Siste
-previous activitycalendar no Forrige
\ No newline at end of file
+previous activitycalendar no Forrige
+state activitycalendar no Status
+state_0 activitycalendar no Ingen
+state_1 activitycalendar no Ny
+state_2 activitycalendar no Endring
+state_3 activitycalendar no Akseptert
+state_4 activitycalendar no Behandlet
+state_5 activitycalendar no Avvist
\ No newline at end of file
Modified:
branches/Version-1_0-branch/activitycalendar/templates/base/activity.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/templates/base/activity.php
2011-05-04 11:33:52 UTC (rev 7256)
+++ branches/Version-1_0-branch/activitycalendar/templates/base/activity.php
2011-05-04 12:01:07 UTC (rev 7257)
@@ -1,11 +1,13 @@
<?php
//include common logic for all templates
include("common.php");
+ $act_so = activitycalendar_soactivity::get_instance();
+ $contpers_so = activitycalendar_socontactperson::get_instance();
?>
<div class="yui-content">
<div id="details">
- <h1><img src="<?php echo ACTIVITYCALENDAR_TEMPLATE_PATH
?>images/32x32/custom/contact.png" /><?php echo lang('activity') ?></h1>
+ <h1><img src="<?php echo ACTIVITYCALENDAR_IMAGE_PATH
?>images/32x32/custom/contact.png" /><?php echo lang('activity') ?></h1>
<form action="#" method="post">
<input type="hidden" name="id" value="<?php
if($activity->get_id()){ echo $activity->get_id(); } else { echo '0'; } ?>"/>
<dl class="proplist-col">
@@ -54,7 +56,9 @@
}
else
{
- echo
$activity->get_organization_id();
+
if($activity->get_organization_id()){
+ echo
activitycalendar_soorganization::get_instance()->get_organization_name($activity->get_organization_id());
+ }
}
?>
</dd>
@@ -84,7 +88,9 @@
}
else
{
- echo $activity->get_group_id();
+ if($activity->get_group_id()){
+ echo
activitycalendar_sogroup::get_instance()->get_group_name($activity->get_group_id());
+ }
}
?>
</dd>
@@ -112,11 +118,42 @@
}
else
{
- echo $activity->get_arena();
+ if($activity->get_arena()){
+ echo
activitycalendar_soarena::get_instance()->get_arena_name($activity->get_arena());
+ }
}
?>
</dd>
<dt>
+ <?php if($activity->get_state() ||
$editable) { ?>
+ <label for="state"><?php echo
lang('state') ?></label>
+ <?php } ?>
+ </dt>
+ <dd>
+ <?php
+ if ($editable)
+ {
+ $selected_state =
$activity->get_state();
+ ?>
+ <select name="state">
+ <option value="0" <?php
echo ($selected_state == 0 ? 'selected="selected"' : "")?>>Ingen status
valgt</option>
+ <option value="1" <?php
echo ($selected_state == 1 ? 'selected="selected"' : "")?>><?php echo
lang('new') ?></option>
+ <option value="2" <?php
echo ($selected_state == 2 ? 'selected="selected"' : "")?>><?php echo
lang('change') ?></option>
+ <option value="3" <?php
echo ($selected_state == 3 ? 'selected="selected"' : "")?>><?php echo
lang('accepted') ?></option>
+ <option value="4" <?php
echo ($selected_state == 4 ? 'selected="selected"' : "")?>><?php echo
lang('processed') ?></option>
+ <option value="5" <?php
echo ($selected_state == 5 ? 'selected="selected"' : "")?>><?php echo
lang('rejected') ?></option>
+ </select>
+ <?php
+ }
+ else
+ {
+ if($activity->get_state() &&
$activity->get_state() > 0){
+ echo
lang('state_'.$activity->get_state());
+ }
+ }
+ ?>
+ </dd>
+ <dt>
<?php if($activity->get_category() ||
$editable) { ?>
<label for="category"><?php echo
lang('category') ?></label>
<?php } ?>
@@ -140,7 +177,9 @@
}
else
{
- echo $activity->get_category();
+ if($activity->get_category()){
+ echo
$act_so->get_category_name($activity->get_category());
+ }
}
?>
</dd>
@@ -168,7 +207,9 @@
}
else
{
- echo $activity->get_target();
+ if($activity->get_target()){
+ echo
$act_so->get_target_name($activity->get_target());
+ }
}
?>
</dd>
@@ -196,7 +237,9 @@
}
else
{
- echo $activity->get_district();
+ if($activity->get_district()){
+ echo
$act_so->get_district_name($activity->get_district());
+ }
}
?>
</dd>
@@ -253,7 +296,15 @@
}
else
{
- echo
$activity->get_contact_person_1();
+ if($activity->get_group_id())
+ {
+ echo
$contpers_so->get_group_contact_name($activity->get_contact_person_1());
+ }
+ else
if($activity->get_organization_id())
+ {
+ echo
$contpers_so->get_org_contact_name($activity->get_contact_person_1());
+ }
+ //echo
$activity->get_contact_person_1();
}
?>
</dd>
@@ -272,7 +323,15 @@
}
else
{
- echo
$activity->get_contact_person_2();
+ if($activity->get_group_id())
+ {
+ echo
$contpers_so->get_group_contact_name($activity->get_contact_person_2());
+ }
+ else
if($activity->get_organization_id())
+ {
+ echo
$contpers_so->get_org_contact_name($activity->get_contact_person_2());
+ }
+ //echo
$activity->get_contact_person_2();
}
?>
</dd>
Modified:
branches/Version-1_0-branch/activitycalendar/templates/base/activity_list.php
===================================================================
---
branches/Version-1_0-branch/activitycalendar/templates/base/activity_list.php
2011-05-04 11:33:52 UTC (rev 7256)
+++
branches/Version-1_0-branch/activitycalendar/templates/base/activity_list.php
2011-05-04 12:01:07 UTC (rev 7257)
@@ -15,7 +15,7 @@
);
</script>
-<h1><img src="<?php echo ACTIVITYCALENDAR_TEMPLATE_PATH
?>images/32x32/x-office-address-book.png" /> <?php echo lang('activities')
?></h1>
+<h1><img src="<?php echo ACTIVITYCALENDAR_IMAGE_PATH
?>images/32x32/x-office-address-book.png" /> <?php echo lang('activities')
?></h1>
<fieldset>
<input type="submit" name="ctrl_add_activitycalendar_activity"
id="ctrl_add_activitycalendar_activity" value="<?php echo
lang('f_new_activity') ?>" />
Modified:
branches/Version-1_0-branch/activitycalendar/templates/base/activity_list_partial.php
===================================================================
---
branches/Version-1_0-branch/activitycalendar/templates/base/activity_list_partial.php
2011-05-04 11:33:52 UTC (rev 7256)
+++
branches/Version-1_0-branch/activitycalendar/templates/base/activity_list_partial.php
2011-05-04 12:01:07 UTC (rev 7257)
@@ -17,21 +17,21 @@
sortable: true
},
{
- key: "organization_id",
- label: "<?php echo lang('organization') ?>",
+ key: "title",
+ label: "<?php echo lang('title') ?>",
sortable: true
},
{
- key: "title",
- label: "<?php echo lang('title') ?>",
+ key: "state",
+ label: "<?php echo lang('status') ?>",
sortable: true
},
-// {
-// key: "status",
-// label: "<?php echo lang('status') ?>",
-// sortable: true
-// },
{
+ key: "organization_id",
+ label: "<?php echo lang('organization') ?>",
+ sortable: true
+ },
+ {
key: "group_id",
label: "<?php echo lang('group') ?>",
sortable: true
@@ -109,7 +109,7 @@
'index.php?menuaction=activitycalendar.uiactivities.query&phpgw_return_as=json<?php
echo $url_add_on; ?>&editable=<?php echo $editable ? "true" : "false"; ?>',
columnDefs,
'<?php echo $list_id ?>_form',
- ['<?php echo $list_id ?>_ctrl_search_query'],
+ ['<?php echo $list_id ?>_ctrl_toggle_activity_state', '<?php
echo $list_id ?>_ctrl_toggle_activity_district', '<?php echo $list_id
?>_ctrl_search_query'],
'<?php echo $list_id ?>_container',
'<?php echo $list_id ?>_paginator',
'<?php echo $list_id ?>',
@@ -156,12 +156,12 @@
<fieldset>
<!-- Filters -->
- <label class="toolbar_element_label"
for="ctrl_toggle_activity_type"><?php echo lang('activity_type') ?></label>
- <select name="activity_type" id="<?php echo $list_id
?>_ctrl_toggle_activity_type">
- <option value="all"><?php echo lang('all') ?></option>
- <option value="1"><?php echo lang('internal')
?></option>
- <option value="2" ><?php echo lang('not_internal')
?></option>
- </select>
+<!-- <label class="toolbar_element_label"
for="ctrl_toggle_activity_type"><?php //echo lang('activity_type') ?></label>
+ <select name="activity_type" id="<?php //echo $list_id
?>_ctrl_toggle_activity_type">
+ <option value="all"><?php //echo lang('all') ?></option>
+ <option value="1"><?php //echo lang('internal')
?></option>
+ <option value="2" ><?php //echo lang('not_internal')
?></option>
+ </select> -->
<label class="toolbar_element_label"
for="ctrl_toggle_activity_state"><?php echo lang('activity_state') ?></label>
<select name="activity_state" id="<?php echo $list_id
?>_ctrl_toggle_activity_state">
<option value="all"><?php echo lang('all') ?></option>
@@ -171,6 +171,19 @@
<option value="4" ><?php echo lang('processed')
?></option>
<option value="5" ><?php echo lang('rejected')
?></option>
</select>
+ <label class="toolbar_element_label"
for="ctrl_toggle_activity_district"><?php echo lang('district') ?></label>
+ <?php
+ $districts =
activitycalendar_soactivity::get_instance()->select_district_list();
+ ?>
+ <select name="activity_district" id="<?php echo $list_id
?>_ctrl_toggle_activity_district">
+ <option value="all"><?php echo lang('all') ?></option>
+ <?php
+ foreach($districts as $district)
+ {
+ echo "<option
value=\"{$district['id']}\">".$district['name']."</option>";
+ }
+ ?>
+ </select>
</fieldset>
Modified: branches/Version-1_0-branch/activitycalendar/templates/base/arena.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/templates/base/arena.php
2011-05-04 11:33:52 UTC (rev 7256)
+++ branches/Version-1_0-branch/activitycalendar/templates/base/arena.php
2011-05-04 12:01:07 UTC (rev 7257)
@@ -4,7 +4,7 @@
?>
<div class="identifier-header">
- <h1><img src="<?php echo ACTIVITYCALENDAR_TEMPLATE_PATH
?>images/32x32/custom/contact.png" /><?php echo lang('arena') ?></h1>
+ <h1><img src="<?php echo ACTIVITYCALENDAR_IMAGE_PATH
?>images/32x32/custom/contact.png" /><?php echo lang('arena') ?></h1>
<div>
<label><?php echo lang('name'); ?></label>
<?php if($arena->get_arena_name()){ echo
$arena->get_arena_name(); } else { echo lang('no_value'); }?>
Modified:
branches/Version-1_0-branch/activitycalendar/templates/base/arena_list.php
===================================================================
--- branches/Version-1_0-branch/activitycalendar/templates/base/arena_list.php
2011-05-04 11:33:52 UTC (rev 7256)
+++ branches/Version-1_0-branch/activitycalendar/templates/base/arena_list.php
2011-05-04 12:01:07 UTC (rev 7257)
@@ -15,7 +15,7 @@
);
</script>
-<h1><img src="<?php echo ACTIVITYCALENDAR_TEMPLATE_PATH
?>images/32x32/x-office-address-book.png" /> <?php echo lang('arenas') ?></h1>
+<h1><img src="<?php echo ACTIVITYCALENDAR_IMAGE_PATH
?>images/32x32/x-office-address-book.png" /> <?php echo lang('arenas') ?></h1>
<fieldset>
<input type="submit" name="ctrl_add_activitycalendar_arena"
id="ctrl_add_activitycalendar_arena" value="<?php echo lang('f_new_arena') ?>"
/>
Modified:
branches/Version-1_0-branch/activitycalendar/templates/base/arena_list_partial.php
===================================================================
---
branches/Version-1_0-branch/activitycalendar/templates/base/arena_list_partial.php
2011-05-04 11:33:52 UTC (rev 7256)
+++
branches/Version-1_0-branch/activitycalendar/templates/base/arena_list_partial.php
2011-05-04 12:01:07 UTC (rev 7257)
@@ -117,12 +117,13 @@
<option value="1"><?php echo lang('internal')
?></option>
<option value="2" ><?php echo lang('not_internal')
?></option>
</select>
- <label class="toolbar_element_label" for="<?php echo $list_id
?>_ctrl_toggle_active"><?php echo lang('marked_as') ?></label>
- <select name="active" id="<?php echo $list_id
?>_ctrl_toggle_active">
- <option value="all"><?php echo
lang('not_available_nor_hidden') ?></option>
- <option value="active"><?php echo
lang('available_for_pick') ?></option>
- <option value="inactive"><?php echo
lang('hidden_for_pick') ?></option>
+<!-- <label class="toolbar_element_label" for="<?php //echo $list_id
?>_ctrl_toggle_active"><?php //echo lang('marked_as') ?></label>
+ <select name="active" id="<?php //echo $list_id
?>_ctrl_toggle_active">
+ <option value="all"><?php //echo
lang('not_available_nor_hidden') ?></option>
+ <option value="active"><?php //echo
lang('available_for_pick') ?></option>
+ <option value="inactive"><?php //echo
lang('hidden_for_pick') ?></option>
</select>
+ -->
</fieldset>
Modified:
branches/Version-1_0-branch/activitycalendar/templates/base/organization_list.php
===================================================================
---
branches/Version-1_0-branch/activitycalendar/templates/base/organization_list.php
2011-05-04 11:33:52 UTC (rev 7256)
+++
branches/Version-1_0-branch/activitycalendar/templates/base/organization_list.php
2011-05-04 12:01:07 UTC (rev 7257)
@@ -2,11 +2,10 @@
include("common.php");
?>
-<h1><img src="<?php echo RENTAL_TEMPLATE_PATH
?>images/32x32/x-office-address-book.png" /> <?php echo lang('organizations')
?></h1>
+<h1><img src="<?php echo ACTIVITYCALENDAR_IMAGE_PATH
?>images/32x32/x-office-address-book.png" /> <?php echo lang('organizations')
?></h1>
<?php
-echo "tester";
$list_form = true;
$list_id = 'all_organizations';
$url_add_on = '&type=all_organizations';
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7257] Merge 7251:7256 from trunk,
Sigurd Nes <=