[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7253] fixed image paths
|
From: |
Erik Holm-Larsen |
|
Subject: |
[Fmsystem-commits] [7253] fixed image paths |
|
Date: |
Wed, 04 May 2011 11:03:57 +0000 |
Revision: 7253
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7253
Author: erikhl
Date: 2011-05-04 11:03:57 +0000 (Wed, 04 May 2011)
Log Message:
-----------
fixed image paths
Modified Paths:
--------------
trunk/activitycalendar/inc/class.soactivity.inc.php
trunk/activitycalendar/inc/class.uicommon.inc.php
trunk/activitycalendar/setup/phpgw_no.lang
trunk/activitycalendar/templates/base/activity.php
trunk/activitycalendar/templates/base/activity_list.php
trunk/activitycalendar/templates/base/arena.php
trunk/activitycalendar/templates/base/arena_list.php
trunk/activitycalendar/templates/base/arena_list_partial.php
trunk/activitycalendar/templates/base/organization_list.php
Modified: trunk/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soactivity.inc.php 2011-05-04 06:41:34 UTC
(rev 7252)
+++ trunk/activitycalendar/inc/class.soactivity.inc.php 2011-05-04 11:03:57 UTC
(rev 7253)
@@ -137,6 +137,7 @@
$columns[] = 'activity.district';
$columns[] = 'activity.state';
$columns[] = 'activity.category';
+ $columns[] = 'activity.target';
$columns[] = 'activity.description';
$columns[] = 'activity.arena';
$columns[] = 'activity.time';
@@ -203,7 +204,7 @@
'district = ' .
$this->marshal($activity->get_district(), 'int'),
'category = ' .
$this->marshal($activity->get_category(), 'int'),
'state = ' .
$this->marshal($activity->get_state(), 'int'),
- 'target = ' . $this->marshal($activity->get_target(),
'string'),
+ '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'),
@@ -248,6 +249,7 @@
$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: trunk/activitycalendar/inc/class.uicommon.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uicommon.inc.php 2011-05-04 06:41:34 UTC
(rev 7252)
+++ trunk/activitycalendar/inc/class.uicommon.inc.php 2011-05-04 11:03:57 UTC
(rev 7253)
@@ -2,6 +2,7 @@
phpgw::import_class('phpgwapi.yui');
define("ACTIVITYCALENDAR_TEMPLATE_PATH",
"activitycalendar/templates/base/");
+ define("ACTIVITYCALENDAR_IMAGE_PATH", "rental/templates/base/");
/**
Modified: trunk/activitycalendar/setup/phpgw_no.lang
===================================================================
--- trunk/activitycalendar/setup/phpgw_no.lang 2011-05-04 06:41:34 UTC (rev
7252)
+++ trunk/activitycalendar/setup/phpgw_no.lang 2011-05-04 11:03:57 UTC (rev
7253)
@@ -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
@@ -362,6 +362,7 @@
first activitycalendar no Første
last activitycalendar no Siste
previous activitycalendar no Forrige
+state activitycalendar no Status
state_0 activitycalendar no Ingen
state_1 activitycalendar no Ny
state_2 activitycalendar no Endring
Modified: trunk/activitycalendar/templates/base/activity.php
===================================================================
--- trunk/activitycalendar/templates/base/activity.php 2011-05-04 06:41:34 UTC
(rev 7252)
+++ trunk/activitycalendar/templates/base/activity.php 2011-05-04 11:03:57 UTC
(rev 7253)
@@ -1,11 +1,12 @@
<?php
//include common logic for all templates
include("common.php");
+ $act_so = activitycalendar_soactivity::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">
@@ -139,7 +140,7 @@
}
else
{
- echo $activity->get_state();
+ echo
lang('state_'.$activity->get_state());
}
?>
</dd>
@@ -167,7 +168,7 @@
}
else
{
- echo $activity->get_category();
+ echo
$act_so->get_category_name($activity->get_category());
}
?>
</dd>
@@ -195,7 +196,7 @@
}
else
{
- echo $activity->get_target();
+ echo
$act_so->get_target_name($activity->get_target());
}
?>
</dd>
@@ -223,7 +224,7 @@
}
else
{
- echo $activity->get_district();
+ echo
$act_so->get_district_name($activity->get_district());
}
?>
</dd>
Modified: trunk/activitycalendar/templates/base/activity_list.php
===================================================================
--- trunk/activitycalendar/templates/base/activity_list.php 2011-05-04
06:41:34 UTC (rev 7252)
+++ trunk/activitycalendar/templates/base/activity_list.php 2011-05-04
11:03:57 UTC (rev 7253)
@@ -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: trunk/activitycalendar/templates/base/arena.php
===================================================================
--- trunk/activitycalendar/templates/base/arena.php 2011-05-04 06:41:34 UTC
(rev 7252)
+++ trunk/activitycalendar/templates/base/arena.php 2011-05-04 11:03:57 UTC
(rev 7253)
@@ -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: trunk/activitycalendar/templates/base/arena_list.php
===================================================================
--- trunk/activitycalendar/templates/base/arena_list.php 2011-05-04
06:41:34 UTC (rev 7252)
+++ trunk/activitycalendar/templates/base/arena_list.php 2011-05-04
11:03:57 UTC (rev 7253)
@@ -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: trunk/activitycalendar/templates/base/arena_list_partial.php
===================================================================
--- trunk/activitycalendar/templates/base/arena_list_partial.php
2011-05-04 06:41:34 UTC (rev 7252)
+++ trunk/activitycalendar/templates/base/arena_list_partial.php
2011-05-04 11:03:57 UTC (rev 7253)
@@ -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: trunk/activitycalendar/templates/base/organization_list.php
===================================================================
--- trunk/activitycalendar/templates/base/organization_list.php 2011-05-04
06:41:34 UTC (rev 7252)
+++ trunk/activitycalendar/templates/base/organization_list.php 2011-05-04
11:03:57 UTC (rev 7253)
@@ -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] [7253] fixed image paths,
Erik Holm-Larsen <=