[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7715]
|
From: |
Erik Holm-Larsen |
|
Subject: |
[Fmsystem-commits] [7715] |
|
Date: |
Fri, 23 Sep 2011 08:03:43 +0000 |
Revision: 7715
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7715
Author: erikhl
Date: 2011-09-23 08:03:42 +0000 (Fri, 23 Sep 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/activitycalendarfrontend/setup/phpgw_no.lang
trunk/activitycalendarfrontend/templates/base/activity.php
trunk/activitycalendarfrontend/templates/base/css/base.css
Modified: trunk/activitycalendarfrontend/setup/phpgw_no.lang
===================================================================
--- trunk/activitycalendarfrontend/setup/phpgw_no.lang 2011-09-23 08:03:32 UTC
(rev 7714)
+++ trunk/activitycalendarfrontend/setup/phpgw_no.lang 2011-09-23 08:03:42 UTC
(rev 7715)
@@ -58,4 +58,6 @@
org_helptext activitycalendarfrontend no Velg organisasjon
aktiviteten skal knyttes til. <br/>Dersom din organisasjon ikke finnes, velg
"Ny organisasjon" og fyll ut feltene som vises under.
group_helptext activitycalendarfrontend no Velg gruppe/lag
aktiviteten skal knyttes til. <br/>Dersom gruppen/laget ikke finnes, velg "Ny
gruppe" og fyll ut feltene som vises under.
int_arena_helptext activitycalendarfrontend no Dersom
aktiviteten skal finne sted i et kommunalt bygg velges dette fra listen her.
-arena_helptext activitycalendarfrontend no Dersom aktiviteten skal
finne sted på en ikke-kommunal arena, velges dette her.<br/>Dersom aktiviteten
finner sted på flere arenaer, velg hovedarena her.
\ No newline at end of file
+arena_helptext activitycalendarfrontend no Dersom aktiviteten skal
finne sted på en ikke-kommunal arena, velges dette her.<br/>Dersom aktiviteten
finner sted på flere arenaer, velg hovedarena her.
+messages_saved_form activitycalendarfrontend no Aktiviteten ble
lagret
+messages_form_error activitycalendarfrontend no Det oppstod et
problem under lagring
\ No newline at end of file
Modified: trunk/activitycalendarfrontend/templates/base/activity.php
===================================================================
--- trunk/activitycalendarfrontend/templates/base/activity.php 2011-09-23
08:03:32 UTC (rev 7714)
+++ trunk/activitycalendarfrontend/templates/base/activity.php 2011-09-23
08:03:42 UTC (rev 7715)
@@ -21,12 +21,12 @@
if(org_id != null && org_id == 'new_org')
{
//alert('new_org');
- document.getElementById('new_org_group').style.display =
"block";
+ document.getElementById('new_org').style.display = "block";
document.getElementById('new_org_fields').style.display =
"block";
}
else
{
- document.getElementById('new_org_group').style.display = "none";
+ document.getElementById('new_org').style.display = "none";
document.getElementById('new_org_fields').style.display =
"none";
var divcontent_start = "<select name=\"group_id\"
id=\"group_id\" onchange=\"javascript:checkNewGroup()\">";
var divcontent_end = "</select>";
@@ -53,12 +53,12 @@
var group_selected = document.getElementById('group_id').value;
if(group_selected == 'new_group')
{
- document.getElementById('new_org_group').style.display =
"block";
+ document.getElementById('new_group').style.display = "block";
document.getElementById('new_group_fields').style.display =
"block";
}
else
{
- document.getElementById('new_org_group').style.display = "none";
+ document.getElementById('new_group').style.display = "none";
document.getElementById('new_group_fields').style.display =
"none";
}
}
@@ -111,6 +111,17 @@
<div class="yui-content">
<div id="details">
+
+ <?php if($message){?>
+ <div class="success">
+ <?php echo $message;?>
+ </div>
+ <?php }else if($error){?>
+ <div class="error">
+ <?php echo $error;?>
+ </div>
+ <?php }?>
+ </div>
<h1><?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'; } ?>"/>
@@ -169,36 +180,7 @@
}
?>
</dd>
- <dt>
- <?php if($activity->get_group_id() ||
$editable) { ?>
- <label for="group_id"><?php echo
lang('group') ?></label>
- <?php } ?>
- </dt>
- <dd>
- <?php
- $current_group_id =
$activity->get_group_id();
- if ($editable)
- {
- ?>
- <?php echo
lang('group_helptext')?><br/>
- <div id="group_select">
- <select name="group_id"
id="group_id">
- <option
value="0">Ingen gruppe valgt</option>
- </select>
- </div>
- <?php
- ?>
- <?php
- }
- else
- {
- if($activity->get_group_id()){
- echo
activitycalendar_sogroup::get_instance()->get_group_name($activity->get_group_id());
- }
- }
- ?>
- </dd>
- <div id="new_org_group" style="display: none;">
+ <div id="new_org" style="display: none;">
<hr/>
<div id="new_org_fields"
style="display: none;">
<label
for="orgname">Organisasjonsnavn</label>
@@ -233,6 +215,60 @@
<textarea rows="10" cols="100"
name="org_description"></textarea>
</div>
<hr/>
+ <b>Kontaktperson 1</b><br/>
+ <label for="contact1_name">Navn</label>
+ <input type="text"
name="contact1_name"/><br/>
+ <label
for="contact1_phone">Telefon</label>
+ <input type="text"
name="contact1_phone"/><br/>
+ <label
for="contact1_mail">E-post</label>
+ <input type="text"
name="contact1_mail"/><br/>
+ <b>Kontaktperson 2</b><br/>
+ <label for="contact2_name">Navn</label>
+ <input type="text"
name="contact2_name"/><br/>
+ <label
for="contact2_phone">Telefon</label>
+ <input type="text"
name="contact2_phone"/><br/>
+ <label
for="contact2_mail">E-post</label>
+ <input type="text"
name="contact2_mail"/><br/>
+ <label
for="contact2_address">Adresse</label>
+ <input type="text"
name="contact2_address_txt" id="contact2_address_txt"
onkeyup="javascript:get_address_search_cp2()"/>
+ <div
id="contact2_address_container"></div><br/>
+ <label
for="contact2_number">Nummer</label>
+ <input type="text"
name="contact2_number"/><br/>
+ <label
for="contact2_postaddress">Postnummer / Sted</label>
+ <input type="text"
name="contact2_postaddress"/>
+ <hr/>
+ </div>
+ <dt>
+ <?php if($activity->get_group_id() ||
$editable) { ?>
+ <label for="group_id"><?php echo
lang('group') ?></label>
+ <?php } ?>
+ </dt>
+ <dd>
+ <?php
+ $current_group_id =
$activity->get_group_id();
+ if ($editable)
+ {
+ ?>
+ <?php echo
lang('group_helptext')?><br/>
+ <div id="group_select">
+ <select name="group_id"
id="group_id">
+ <option
value="0">Ingen gruppe valgt</option>
+ </select>
+ </div>
+ <?php
+ ?>
+ <?php
+ }
+ else
+ {
+ if($activity->get_group_id()){
+ echo
activitycalendar_sogroup::get_instance()->get_group_name($activity->get_group_id());
+ }
+ }
+ ?>
+ </dd>
+ <div id="new_group" style="display: none;">
+ <hr/>
<div id="new_group_fields"
style="display: none;">
<label
for="groupname">Gruppenavn</label>
<input type="text"
name="groupname"/><br/>
@@ -337,12 +373,8 @@
$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
}
Modified: trunk/activitycalendarfrontend/templates/base/css/base.css
===================================================================
--- trunk/activitycalendarfrontend/templates/base/css/base.css 2011-09-23
08:03:32 UTC (rev 7714)
+++ trunk/activitycalendarfrontend/templates/base/css/base.css 2011-09-23
08:03:42 UTC (rev 7715)
@@ -239,6 +239,24 @@
margin-left: 5px;
}
+div.success {
+ font-weight: normal;
+ margin:10px;
+ padding:5px;
+ font-size:1.1em;
+ text-align: left;
+ background-color: green;
+ border:1px solid #9F6000;
+ color: white;
+}
-
-
+div.error {
+ font-weight: normal;
+ margin:10px;
+ padding:5px;
+ font-size:1.1em;
+ text-align: left;
+ background-color: red;
+ border:1px solid #9F6000;
+ color: white;
+}
\ No newline at end of file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7715],
Erik Holm-Larsen <=