[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9884] fixed javascript for ie7
|
From: |
Erik Holm-Larsen |
|
Subject: |
[Fmsystem-commits] [9884] fixed javascript for ie7 |
|
Date: |
Tue, 21 Aug 2012 06:39:25 +0000 |
Revision: 9884
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9884
Author: erikhl
Date: 2012-08-21 06:39:23 +0000 (Tue, 21 Aug 2012)
Log Message:
-----------
fixed javascript for ie7
Modified Paths:
--------------
trunk/activitycalendarfrontend/templates/base/activity_new.php
trunk/activitycalendarfrontend/templates/base/activity_new_step_1.php
Modified: trunk/activitycalendarfrontend/templates/base/activity_new.php
===================================================================
--- trunk/activitycalendarfrontend/templates/base/activity_new.php
2012-08-20 21:24:45 UTC (rev 9883)
+++ trunk/activitycalendarfrontend/templates/base/activity_new.php
2012-08-21 06:39:23 UTC (rev 9884)
@@ -6,6 +6,14 @@
?>
<script type="text/javascript">
+
+$(document).ready(function(){
+ var text = document.getElementById("displayText");
+ //ele.hide();
+ $("#toggleText").hide();
+ text.innerHTML = "Ikke i listen? Registrer ny organisasjon";
+ });
+
function toggle() {
var ele = document.getElementById("toggleText");
var text = document.getElementById("displayText");
@@ -20,30 +28,7 @@
arenahidden.value="new_arena";
}
}
-function toggle2() {
- var ele = document.getElementById("toggleText2");
- var text = document.getElementById("displayText2");
- if(ele.style.display == "block") {
- ele.style.display = "none";
- text.innerHTML = "Legg til alternativ kontaktperson";
- }
- else {
- ele.style.display = "block";
- text.innerHTML = "";
- }
-}
-function toggle3() {
- var ele = document.getElementById("toggleText3");
- var text = document.getElementById("displayText3");
- if(ele.style.display == "block") {
- ele.style.display = "none";
- text.innerHTML = "Registrer ny organisasjon";
- }
- else {
- ele.style.display = "block";
- text.innerHTML = "(X)";
- }
-}
+
function showhide(id)
{
if(id == "org")
@@ -377,7 +362,8 @@
<BR>
<A id="displayText"
href="javascript:toggle();">Ikke i listen? Registrer nytt lokale</A>
</dd>
- <DIV style="overflow: auto; display: none;"
id="toggleText">
+ <DIV style="overflow: auto;" id="toggleText">
+ <dl>
<DT>
<label for="new_arena"><?php echo
lang('register_new_arena') ?></label>
<A
onclick="window.open('hjelp.html','name','height=255,
width=350,toolbar=no,directories=no,status=no,
menubar=no,scrollbars=no,resizable=no'); return false;"
@@ -410,6 +396,7 @@
<INPUT name="arena_postaddress" size="40"
type="text">
</DT>
<BR>
+ </dl>
</DIV>
<dt>
<br/>
@@ -451,19 +438,7 @@
<DT><LABEL for="contact_mail">E-post (*)</LABEL></DT>
<DD><INPUT name="contact_mail" id="contact_mail" size="50"
type="text"></DD>
<DT><LABEL for="contact2_mail2">Gjenta e-post
(*)</LABEL></DT>
- <DD><INPUT name="contact_mail2" id="contact_mail2" size="50"
type="text"></DD><!-- <a id="displayText2" href="javascript:toggle2();">Legg
til alternativ kontaktperson</a><br>
- <div id="toggleText2" style="display: none">
-
- Alternativ kontaktperson <a href="hjelp.html"
target="name"
-onclick="window.open('hjelp.html','name','height=255,
width=350,toolbar=no,directories=no,status=no,
menubar=no,scrollbars=no,resizable=no'); return false;"
-><img src="images/hjelp.gif" alt="Hjelp"></a><br>
- <dt><label for="contact1_name">Navn
(*)</label></dt>
- <dd><input name="org_contact1_name" size="80"
type="text"></dd>
- <dt><label for="contact1_phone">Telefon
(*)</label></dt>
- <dd><input name="org_contact1_phone"
type="text"></dd>
- <dt><label for="contact1_mail">E-post
(*)</label></dt>
- <dd><input name="org_contact1_mail" type="text"
size="50"></dd>
- </div><br> -->
+ <DD><INPUT name="contact_mail2" id="contact_mail2" size="50"
type="text"></DD>
</FIELDSET>
<FIELDSET>
<BR>
Modified: trunk/activitycalendarfrontend/templates/base/activity_new_step_1.php
===================================================================
--- trunk/activitycalendarfrontend/templates/base/activity_new_step_1.php
2012-08-20 21:24:45 UTC (rev 9883)
+++ trunk/activitycalendarfrontend/templates/base/activity_new_step_1.php
2012-08-21 06:39:23 UTC (rev 9884)
@@ -3,8 +3,8 @@
$(document).ready(function(){
var ele = document.getElementById("toggleText3");
var text = document.getElementById("displayText3");
- ele.style.display = "none";
- ele.style.visibility = "hidden";
+ //ele.hide();
+ $("#toggleText3").hide();
text.innerHTML = "Ikke i listen? Registrer ny organisasjon";
});
@@ -13,16 +13,9 @@
var ele = document.getElementById("toggleText3");
var org_id = document.getElementById("organization_id_hidden");
var text = document.getElementById("displayText3");
- if(ele.style.display == "block") {
- ele.style.display = "none";
- text.innerHTML = "Registrer ny organisasjon";
- }
- else {
- ele.style.display = "block";
- ele.style.visibility = "visible";
+ $("#toggleText3").show();
text.innerHTML = "";
org_id.value = "new_org";
- }
})
});
function toggle() {
@@ -64,6 +57,22 @@
org_id.value = "new_org";
}
}
+
+ function toggle4() {
+ var ele = document.getElementById("toggleText3");
+ var org_id = document.getElementById("organization_id_hidden");
+ var text = document.getElementById("displayText3");
+ if(ele.style.display == "block") {
+ document.getElementById("toggleText3").style.display =
"none";
+ text.innerHTML = "Registrer ny organisasjon";
+ }
+ else {
+ document.getElementById("toggleText3").style.display =
"block";
+ document.getElementById("toggleText3").style.visibility
= "visible";
+ text.innerHTML = "";
+ org_id.value = "new_org";
+ }
+ }
function showhide(id)
{
if(id == "org")
@@ -167,8 +176,8 @@
<h1><?php echo lang('new_activity_helptext') ?></h1>
<form action="#" method="post">
<input type="hidden" name="organization_id_hidden"
id="organization_id_hidden" value="" />
+ <fieldset>
<dl class="proplist-col">
- <fieldset>
<legend><?php echo lang('responsible')
?></legend>
<dt>
@@ -189,15 +198,17 @@
</select>
<br/>
</dd>
+
<a id="displayText3" href="#">Ikke i listen? Registrer
ny organisasjon</a><br/>
- <DIV style="overflow: auto;" id="toggleText3">
- <DIV style="overflow: auto;">
+ <dt>
+ <DIV style="overflow: hidden" id="toggleText3">
+ <dl>
+ <DIV style="overflow: hidden;">
<P>Registrer ny organisasjon <A
onclick="window.open('hjelp.html','name','height=255,
width=350,toolbar=no,directories=no,status=no,
menubar=no,scrollbars=no,resizable=no'); return false;"
href="http://dl-web.dropbox.com/u/44022695/Aktivitetsoversikt/hjelp.html";
target="name"><IMG
alt="Hjelp" src="/aktivitetsoversikt/images/hjelp.gif"></A>
</P>
Felt merket med (*) er påkrevde
felt <BR/><BR/>
- <P></P>
<dt><label
for="orgname">Organisasjonsnavn (*)</label>
<A
onclick="window.open('hjelp.html','name','height=255,
width=350,toolbar=no,directories=no,status=no,
menubar=no,scrollbars=no,resizable=no'); return false;"
@@ -228,7 +239,7 @@
<IMG alt="Hjelp"
src="/aktivitetsoversikt/images/hjelp.gif"></A></LABEL>
</DT>
<DD><INPUT name="homepage" value="http://"; size="80"
type="text"></DD><BR/><BR/>
- <DIV style="overflow: auto;">
+ <DIV style="overflow: hidden;">
Kontaktperson for organisasjonen <A
onclick="window.open('hjelp.html','name','height=255,
width=350,toolbar=no,directories=no,status=no,
menubar=no,scrollbars=no,resizable=no'); return false;"
href="http://dl-web.dropbox.com/u/44022695/Aktivitetsoversikt/hjelp.html";
target="name">
<IMG alt="Hjelp"
src="/aktivitetsoversikt/images/hjelp.gif"></A><BR/>
<DT><LABEL for="contact1_name">Navn (*)</LABEL></DT>
@@ -240,14 +251,15 @@
<DT><LABEL for="contact2_mail">Gjenta e-post
(*)</LABEL></DT>
<DD><INPUT name="org_contact2_mail"
id="org_contact2_mail" size="50" type="text"></DD>
</DIV>
+ </dl>
</DIV>
- </fieldset>
+ </dt>
<br/><br/>
<div class="form-buttons">
<input type="submit" name="step_1" value="<?php
echo lang('next') ?>" onclick="return isOK();"/>
</div>
</dl>
-
+ </fieldset>
</form>
</div>
</div>
\ No newline at end of file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9884] fixed javascript for ie7,
Erik Holm-Larsen <=