[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8057] feilretting arena
|
From: |
Erik Holm-Larsen |
|
Subject: |
[Fmsystem-commits] [8057] feilretting arena |
|
Date: |
Wed, 09 Nov 2011 06:47:03 +0000 |
Revision: 8057
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8057
Author: erikhl
Date: 2011-11-09 06:46:59 +0000 (Wed, 09 Nov 2011)
Log Message:
-----------
feilretting arena
Modified Paths:
--------------
trunk/activitycalendar/inc/class.uiarena.inc.php
trunk/activitycalendar/setup/phpgw_no.lang
trunk/activitycalendar/templates/base/arena.php
trunk/activitycalendar/templates/base/arena_list_partial.php
trunk/activitycalendar/templates/base/css/base.css
Modified: trunk/activitycalendar/inc/class.uiarena.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiarena.inc.php 2011-11-08 15:36:17 UTC
(rev 8056)
+++ trunk/activitycalendar/inc/class.uiarena.inc.php 2011-11-09 06:46:59 UTC
(rev 8057)
@@ -64,6 +64,7 @@
$errorMsgs = array();
$infoMsgs = array();
$arena =
activitycalendar_soarena::get_instance()->get_single((int)phpgw::get_var('id'));
+ $cancel_link = self::link(array('menuaction' =>
'activitycalendar.uiarena.index'));
if($arena == null) // Not found
{
@@ -72,6 +73,7 @@
$data = array
(
'arena' => $arena,
+ 'cancel_link' => $cancel_link,
'errorMsgs' => $errorMsgs,
'infoMsgs' => $infoMsgs
);
@@ -83,6 +85,7 @@
$GLOBALS['phpgw_info']['flags']['app_header'] .=
'::'.lang('edit');
// Get the contract part id
$arena_id = (int)phpgw::get_var('id');
+ $cancel_link = self::link(array('menuaction' =>
'activitycalendar.uiarena.index'));
$buildings =
activitycalendar_soarena::get_instance()->get_buildings();
//var_dump($buildings);
@@ -105,7 +108,7 @@
$arena->set_internal_arena_id(phpgw::get_var('internal_arena_id'));
$arena->set_arena_name(phpgw::get_var('arena_name'));
$arena->set_address(phpgw::get_var('address') .
' ' . phpgw::get_var('address_no'));
-
$arena->set_active(phpgw::get_var('arena_active') == 'on' ? true : false);
+
$arena->set_active(phpgw::get_var('arena_active') == 'yes' ? true : false);
if(activitycalendar_soarena::get_instance()->store($arena)) // ... and then try
to store the object
{
@@ -116,6 +119,7 @@
$error = lang('messages_form_error');
}
}
+ $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'activitycalendar.uiarena.view', 'id' =>
$arena->get_id()));
}
return $this->render('arena.php', array
@@ -123,6 +127,7 @@
'arena' => $arena,
'buildings' => $buildings,
'editable' => true,
+ 'cancel_link' => $cancel_link,
'message' => isset($message) ? $message :
phpgw::get_var('message'),
'error' => isset($error) ? $error :
phpgw::get_var('error')
)
Modified: trunk/activitycalendar/setup/phpgw_no.lang
===================================================================
--- trunk/activitycalendar/setup/phpgw_no.lang 2011-11-08 15:36:17 UTC (rev
8056)
+++ trunk/activitycalendar/setup/phpgw_no.lang 2011-11-09 06:46:59 UTC (rev
8057)
@@ -380,7 +380,7 @@
mail_body_state_5 activitycalendar no Ditt tips er behandlet,
men vil ikke bli publisert i kommuneportalen. Mvh %1 kulturkontor
send_mail activitycalendar no Send e-post
marked_as activitycalendar no Status
-address_number activitycalendar no Nummer
+address_number activitycalendar no Husnummer
changed_organizations_groups activitycalendar no Endrede
organisasjoner/grupper
changed_org_group activitycalendar no Endringer
building activitycalendar no Kommunale bygg
@@ -393,4 +393,5 @@
inactive_arena activitycalendar no Inaktiv
change_type activitycalendar no Endringstype
added activitycalendar no Lagt til i organisasjonsregisteret
-store activitycalendar no Overfør til organisasjonsregister
\ No newline at end of file
+store activitycalendar no Overfør til organisasjonsregister
+back activitycalendar no Tilbake
\ No newline at end of file
Modified: trunk/activitycalendar/templates/base/arena.php
===================================================================
--- trunk/activitycalendar/templates/base/arena.php 2011-11-08 15:36:17 UTC
(rev 8056)
+++ trunk/activitycalendar/templates/base/arena.php 2011-11-09 06:46:59 UTC
(rev 8057)
@@ -14,10 +14,11 @@
var divcontent_start = "<select name=\"address\" id=\"address\" size\"5\">";
var divcontent_end = "</select>";
+var divcontent_number = " <label for=\"address_number\"><?php echo
lang('address_number') ?></label><input type=\"text\" name=\"address_no\"
id=\"address_no\" size=\"6\"/>"
var callback = {
success: function(response){
- div_address.innerHTML =
divcontent_start + JSON.parse(response.responseText) + divcontent_end;
+ div_address.innerHTML =
divcontent_start + JSON.parse(response.responseText) + divcontent_end +
divcontent_number;
},
failure: function(o) {
alert("AJAX doesn't work"); //FAILURE
@@ -60,34 +61,6 @@
?>
</dd>
<dt>
- <?php
if($arena->get_internal_arena_id() || $editable) { ?>
- <label for="internal_arena_id"><?php
echo lang('internal_arena') ?></label>
- <?php } ?>
- </dt>
- <dd>
- <?php
- $current_building_id =
$arena->get_internal_arena_id();
- if ($editable)
- {
- ?>
- <select
name="internal_arena_id">
- <option value="0">Ingen
arena valgt</option>
- <?php
- foreach($buildings as
$building_id => $building_name)
- {
- echo "<option
".($current_building_id == $building_id? 'selected="selected"' : "")."
value=\"{$building_id}\">".$building_name."</option>";
- }
- ?>
- </select>
- <?php
- }
- else
- {
- echo
activitycalendar_soarena::get_instance()->get_building_name($arena->get_internal_arena_id());
- }
- ?>
- </dd>
- <dt>
<?php if($arena->get_address() ||
$editable) { ?>
<label for="address"><?php echo
lang('address') ?></label>
<?php } ?>
@@ -99,7 +72,6 @@
?>
<input type="text"
name="address" id="address_txt" value="<?php echo $arena->get_address() ?>"
onkeyup="javascript:get_address_search()"/>
<div
id="address_container"></div>
- <label
for="address_number"><?php echo lang('address_number') ?></label><input
type="text" name="address_no" id="address_no"/>
<?php
}
else
@@ -113,7 +85,10 @@
<label for="arena_active"><?php
echo lang('active_arena') ?></label>
</dt>
<dd>
- <input type="checkbox"
name="arena_active" id="arena_active" <?php if($arena->is_active()) { echo
"checked='checked'";} ?>/>
+ <select name="arena_active"
id="arena_active">
+ <option value="yes"
<?php if($arena->is_active()) { echo "selected";} ?>><?php echo
lang('active')?></option>
+ <option value="no"
<?php if(!$arena->is_active()) { echo "selected";} ?>><?php echo
lang('inactive')?></option>
+ </select>
</dd>
<?php
}else{
@@ -126,7 +101,12 @@
<?php
if ($editable) {
echo '<input type="submit"
name="save_arena" value="' . lang('save') . '"/>';
+ echo '<a
href="'.$cancel_link.'">' . lang('cancel') . '</a>';
}
+ else
+ {
+ echo '<a
href="'.$cancel_link.'">' . lang('back') . '</a>';
+ }
?>
</div>
Modified: trunk/activitycalendar/templates/base/arena_list_partial.php
===================================================================
--- trunk/activitycalendar/templates/base/arena_list_partial.php
2011-11-08 15:36:17 UTC (rev 8056)
+++ trunk/activitycalendar/templates/base/arena_list_partial.php
2011-11-09 06:46:59 UTC (rev 8057)
@@ -22,11 +22,6 @@
sortable: true
},
{
- key: "internal_arena_id",
- label: "<?php echo lang('internal_arena_id') ?>",
- sortable: true
- },
- {
key: "address",
label: "<?php echo lang('address') ?>",
sortable: true
@@ -92,7 +87,6 @@
window.location =
'index.php?menuaction=activitycalendar.uiarena.download'+
'<?php echo $url_add_on; ?>'+
'&query='+query+
- '&arena_type='+aType+
'&active='+active+
'&export=true';
}
@@ -114,12 +108,6 @@
<fieldset>
<!-- Filters -->
- <label class="toolbar_element_label"
for="ctrl_toggle_arena_type"><?php echo lang('arena_type') ?></label>
- <select name="arena_type" id="<?php echo $list_id
?>_ctrl_toggle_arena_type">
- <option value="all"><?php echo lang('all') ?></option>
- <option value="internal"><?php echo lang('internal')
?></option>
- <option value="not_internal" ><?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 ($status == 'all') ?
'selected' : ''?>><?php echo lang('all') ?></option>
Modified: trunk/activitycalendar/templates/base/css/base.css
===================================================================
--- trunk/activitycalendar/templates/base/css/base.css 2011-11-08 15:36:17 UTC
(rev 8056)
+++ trunk/activitycalendar/templates/base/css/base.css 2011-11-09 06:46:59 UTC
(rev 8057)
@@ -163,7 +163,7 @@
dl.proplist-col,
dl.form-col {
- width: 18em;
+ width: 40em;
float: left;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8057] feilretting arena,
Erik Holm-Larsen <=