Author: agilliland
Date: Tue Jun 5 14:05:41 2007
New Revision: 544632
URL: http://svn.apache.org/viewvc?view=rev&rev=544632
Log:
add the protoype.js file as part of the normal ui html head and update a bunch
of our javascript to use prototype to lookup DOM elements by id rather than
doing it ourselves. this is meant to ensure proper cross browser support.
Modified:
roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/GlobalCommentManagement.jsp
roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp
roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/UserAdmin.jsp
roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/CreateWeblog.jsp
roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/Login.jsp
roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/Comments.jsp
roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/CommentsSidebar.jsp
roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntriesSidebar.jsp
roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryAdd.jsp
roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryEdit.jsp
roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/MembersInvite.jsp
roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/StylesheetEdit.jsp
roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/TemplateEdit.jsp
roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/ThemeEdit.jsp
roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/ThemeEditSharedThemesOnly.jsp
roller/trunk/apps/weblogger/web/WEB-INF/jsps/tiles/head.jsp
Modified:
roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/GlobalCommentManagement.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/GlobalCommentManagement.jsp?view=diff&rev=544632&r1=544631&r2=544632
==============================================================================
---
roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/GlobalCommentManagement.jsp
(original)
+++
roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/GlobalCommentManagement.jsp
Tue Jun 5 14:05:41 2007
@@ -62,9 +62,9 @@
function handleCommentResponse() {
if (http.readyState == 4) {
comment = eval("(" + http.responseText + ")");
- commentDiv = document.getElementById("comment-" + comment.id);
+ commentDiv = $("comment-" + comment.id);
commentDiv.textContent = comment.content;
- linkDiv = document.getElementById("link-" + comment.id);
+ linkDiv = $("link-" + comment.id);
linkDiv.parentNode.removeChild(linkDiv);
}
isBusy = false;
Modified:
roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp?view=diff&rev=544632&r1=544631&r2=544632
==============================================================================
---
roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp
(original)
+++
roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/GlobalCommentManagementSidebar.jsp
Tue Jun 5 14:05:41 2007
@@ -51,7 +51,7 @@
</script>
<s:textfield name="bean.startDateString" size="12" />
<a href="#" id="anchorCalStart" name="anchorCalStart"
-
onclick="calStart.select(document.getElementById('comments_bean_startDateString'),'anchorCalStart','MM/dd/yy');
return false">
+
onclick="calStart.select($('comments_bean_startDateString'),'anchorCalStart','MM/dd/yy');
return false">
<img src='<s:url value="/images/calendar.png"/>' class="calIcon"
alt="Calendar" /></a>
</div>
@@ -69,7 +69,7 @@
</script>
<s:textfield name="bean.endDateString" size="12" />
<a href="#" id="anchorCalEnd" name="anchorCalEnd"
-
onclick="calEnd.select(document.getElementById('comments_bean_endDateString'),'anchorCalEnd','MM/dd/yy');
return false">
+
onclick="calEnd.select($('comments_bean_endDateString'),'anchorCalEnd','MM/dd/yy');
return false">
<img src='<s:url value="/images/calendar.png"/>' class="calIcon"
alt="Calendar" /></a>
</div>
<br />
Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/UserAdmin.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/UserAdmin.jsp?view=diff&rev=544632&r1=544631&r2=544632
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/UserAdmin.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/UserAdmin.jsp Tue Jun 5
14:05:41 2007
@@ -50,6 +50,6 @@
<%-- this forces focus to the userName field --%>
<script type="text/javascript">
<!--
- document.getElementById('userName').focus();
+ $('userName').focus();
// -->
</script>
Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/CreateWeblog.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/CreateWeblog.jsp?view=diff&rev=544632&r1=544631&r2=544632
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/CreateWeblog.jsp
(original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/CreateWeblog.jsp Tue Jun
5 14:05:41 2007
@@ -23,7 +23,7 @@
document.preview.src="<s:property value="siteURL"
/>/roller-ui/authoring/previewtheme?theme="+theme;
}
function handlePreview(handle) {
- previewSpan = document.getElementById("handlePreview");
+ previewSpan = $("handlePreview");
var n1 = previewSpan.childNodes[0];
var n2 = document.createTextNode(handle.value);
if (handle.value == null) {
Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/Login.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/Login.jsp?view=diff&rev=544632&r1=544631&r2=544632
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/Login.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/core/Login.jsp Tue Jun 5
14:05:41 2007
@@ -59,7 +59,7 @@
<td>
<input type="submit" name="login" id="login" value="<s:text
name="loginPage.login" />" />
<input type="reset" name="reset" id="reset" value="<s:text
name="loginPage.reset" />"
- onclick="document.getElementById('j_username').focus()" />
+ onclick="$('j_username').focus()" />
</td>
</tr>
@@ -73,11 +73,11 @@
if (document.getElementById) {
if (getCookie("username") != null) {
if (document.getElementById) {
- document.getElementById("j_username").value =
getCookie("username");
- document.getElementById("j_password").focus();
+ $("j_username").value = getCookie("username");
+ $("j_password").focus();
}
} else {
- document.getElementById("j_username").focus();
+ $("j_username").focus();
}
}
Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/Comments.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/Comments.jsp?view=diff&rev=544632&r1=544631&r2=544632
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/Comments.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/Comments.jsp Tue Jun 5
14:05:41 2007
@@ -62,9 +62,9 @@
function handleCommentResponse() {
if (http.readyState == 4) {
comment = eval("(" + http.responseText + ")");
- commentDiv = document.getElementById("comment-" + comment.id);
+ commentDiv = $("comment-" + comment.id);
commentDiv.textContent = comment.content;
- linkDiv = document.getElementById("link-" + comment.id);
+ linkDiv = $("link-" + comment.id);
linkDiv.parentNode.removeChild(linkDiv);
}
isBusy = false;
Modified:
roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/CommentsSidebar.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/CommentsSidebar.jsp?view=diff&rev=544632&r1=544631&r2=544632
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/CommentsSidebar.jsp
(original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/CommentsSidebar.jsp Tue
Jun 5 14:05:41 2007
@@ -52,7 +52,7 @@
</script>
<s:textfield name="bean.startDateString" size="12" />
<a href="#" id="anchorCalStart" name="anchorCalStart"
-
onclick="calStart.select(document.getElementById('commentsQuery_bean_startDateString'),'anchorCalStart','MM/dd/yy');
return false">
+
onclick="calStart.select($('commentsQuery_bean_startDateString'),'anchorCalStart','MM/dd/yy');
return false">
<img src='<s:url value="/images/calendar.png"/>' class="calIcon"
alt="Calendar" /></a>
</div>
@@ -70,7 +70,7 @@
</script>
<s:textfield name="bean.endDateString" size="12" />
<a href="#" id="anchorCalEnd" name="anchorCalEnd"
-
onclick="calEnd.select(document.getElementById('commentsQuery_bean_endDateString'),'anchorCalEnd','MM/dd/yy');
return false">
+
onclick="calEnd.select($('commentsQuery_bean_endDateString'),'anchorCalEnd','MM/dd/yy');
return false">
<img src='<s:url value="/images/calendar.png"/>' class="calIcon"
alt="Calendar" /></a>
</div>
<br />
Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntriesSidebar.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntriesSidebar.jsp?view=diff&rev=544632&r1=544631&r2=544632
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntriesSidebar.jsp
(original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntriesSidebar.jsp Tue
Jun 5 14:05:41 2007
@@ -83,7 +83,7 @@
</script>
<s:textfield name="bean.startDateString" size="12" />
<a href="#" id="anchorCalStart" name="anchorCalStart"
-
onclick="calStart.select(document.getElementById('entries_bean_startDateString'),'anchorCalStart','MM/dd/yy');
return false">
+
onclick="calStart.select($('entries_bean_startDateString'),'anchorCalStart','MM/dd/yy');
return false">
<img src='<s:url value="/images/calendar.png"/>'
class="calIcon" alt="Calendar" /></a>
</div>
@@ -101,7 +101,7 @@
</script>
<s:textfield name="bean.endDateString" size="12" />
<a href="#" id="anchorCalEnd" name="anchorCalEnd"
-
onclick="calEnd.select(document.getElementById('entries_bean_endDateString'),'anchorCalEnd','MM/dd/yy');
return false">
+
onclick="calEnd.select($('entries_bean_endDateString'),'anchorCalEnd','MM/dd/yy');
return false">
<img src='<s:url value="/images/calendar.png"/>'
class="calIcon" alt="Calendar" /></a>
</div>
<br />
Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryAdd.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryAdd.jsp?view=diff&rev=544632&r1=544631&r2=544632
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryAdd.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryAdd.jsp Tue Jun 5
14:05:41 2007
@@ -149,7 +149,7 @@
</script>
<s:textfield name="bean.dateString" size="12" />
<a href="#" id="anchorCal" name="anchorCal"
-
onclick="cal.select(document.getElementById('entry_bean_dateString'),'anchorCal','MM/dd/yy');
return false">
+
onclick="cal.select($('entry_bean_dateString'),'anchorCal','MM/dd/yy'); return
false">
<img src='<s:url value="/images/calendar.png"/>' class="calIcon"
alt="Calendar" /></a>
<s:property value="actionWeblog.timeZone" />
</div>
@@ -182,12 +182,12 @@
<br>
<div class="control">
<s:if test="userAnAuthor">
- <s:submit key="weblogEdit.post"
onclick="document.getElementById('entry_bean_status').value='PUBLISHED';"/>
+ <s:submit key="weblogEdit.post"
onclick="$('entry_bean_status').value='PUBLISHED';"/>
</s:if>
<s:else>
- <s:submit key="weblogEdit.submitForReview"
onclick="document.getElementById('entry_bean_status').value='PENDING';"/>
+ <s:submit key="weblogEdit.submitForReview"
onclick="$('entry_bean_status').value='PENDING';"/>
</s:else>
- <s:submit key="weblogEdit.save"
onclick="document.getElementById('entry_bean_status').value='DRAFT';" />
+ <s:submit key="weblogEdit.save"
onclick="$('entry_bean_status').value='DRAFT';" />
</div>
</s:form>
Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryEdit.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryEdit.jsp?view=diff&rev=544632&r1=544631&r2=544632
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryEdit.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/EntryEdit.jsp Tue Jun
5 14:05:41 2007
@@ -181,7 +181,7 @@
</script>
<s:textfield name="bean.dateString" size="12" />
<a href="#" id="anchorCal" name="anchorCal"
-
onclick="cal.select(document.getElementById('entry_bean_dateString'),'anchorCal','MM/dd/yy');
return false">
+
onclick="cal.select($('entry_bean_dateString'),'anchorCal','MM/dd/yy'); return
false">
<img src='<s:url value="/images/calendar.png"/>' class="calIcon"
alt="Calendar" /></a>
<s:property value="actionWeblog.timeZone" />
</div>
@@ -218,13 +218,13 @@
<br>
<div class="control">
<s:if test="userAnAuthor">
- <s:submit key="weblogEdit.post"
onclick="document.getElementById('entry_bean_status').value='PUBLISHED';"/>
+ <s:submit key="weblogEdit.post"
onclick="$('entry_bean_status').value='PUBLISHED';"/>
</s:if>
<s:else>
- <s:submit key="weblogEdit.submitForReview"
onclick="document.getElementById('entry_bean_status').value='PENDING';"/>
+ <s:submit key="weblogEdit.submitForReview"
onclick="$('entry_bean_status').value='PENDING';"/>
</s:else>
- <s:submit key="weblogEdit.save"
onclick="document.getElementById('entry_bean_status').value='DRAFT';" />
+ <s:submit key="weblogEdit.save"
onclick="$('entry_bean_status').value='DRAFT';" />
<s:url id="removeUrl" action="entryRemove">
<s:param name="weblog" value="actionWeblog.handle" />
Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/MembersInvite.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/MembersInvite.jsp?view=diff&rev=544632&r1=544631&r2=544632
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/MembersInvite.jsp
(original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/MembersInvite.jsp Tue
Jun 5 14:05:41 2007
@@ -65,6 +65,6 @@
<%-- this forces focus to the userName field --%>
<script type="text/javascript">
<!--
- document.getElementById('userName').focus();
+ $('userName').focus();
// -->
</script>
Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/StylesheetEdit.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/StylesheetEdit.jsp?view=diff&rev=544632&r1=544631&r2=544632
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/StylesheetEdit.jsp
(original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/StylesheetEdit.jsp Tue
Jun 5 14:05:41 2007
@@ -32,7 +32,7 @@
<script type="text/javascript"><!--
if (getCookie("editorSize1") != null) {
- document.getElementById('stylesheetEdit_contents').rows =
getCookie("editorSize1");
+ $('stylesheetEdit_contents').rows = getCookie("editorSize1");
}
function changeSize(e, num) {
a = e.rows + num;
@@ -57,9 +57,9 @@
<td align="right">
<!-- Add buttons to make this textarea taller or shorter -->
<input type="button" name="taller" value=" ↓ "
-
onclick="changeSize1(document.getElementById('stylesheetEdit_contents'), 5)" />
+ onclick="changeSize1($('stylesheetEdit_contents'), 5)"
/>
<input type="button" name="shorter" value=" ↑ "
-
onclick="changeSize1(document.getElementById('stylesheetEdit_contents'), -5)" />
+ onclick="changeSize1($('stylesheetEdit_contents'), -5)"
/>
</td>
</tr>
</table>
Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/TemplateEdit.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/TemplateEdit.jsp?view=diff&rev=544632&r1=544631&r2=544632
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/TemplateEdit.jsp
(original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/TemplateEdit.jsp Tue
Jun 5 14:05:41 2007
@@ -59,9 +59,9 @@
// Update page URL when user changes link
function updatePageURLDisplay() {
- var previewSpan = document.getElementById('linkPreview');
+ var previewSpan = $('linkPreview');
var n1 = previewSpan.firstChild;
- var n2 =
document.createTextNode(document.getElementById('template_bean_link').value);
+ var n2 = document.createTextNode($('template_bean_link').value);
if (n1 == null) {
previewSpan.appendChild(n2);
} else {
@@ -70,7 +70,7 @@
}
// Don't launch page if user has changed link, it'll be a 404
function launchPage() {
- if (originalLink !=
document.getElementById('template_bean_link').value) {
+ if (originalLink != $('template_bean_link').value) {
window.alert("Link changed, not launching page");
} else {
window.open(weblogURL + '/page/' + originalLink, '_blank');
@@ -115,7 +115,7 @@
<script type="text/javascript"><!--
if (getCookie("editorSize1") != null) {
- document.getElementById('template_bean_contents').rows =
getCookie("editorSize1");
+ $('template_bean_contents').rows = getCookie("editorSize1");
}
function changeSize(e, num) {
a = e.rows + num;
@@ -141,9 +141,9 @@
<td align="right">
<!-- Add buttons to make this textarea taller or shorter -->
<input type="button" name="taller" value=" ↓ "
-
onclick="changeSize1(document.getElementById('template_bean_contents'), 5)" />
+ onclick="changeSize1($('template_bean_contents'), 5)" />
<input type="button" name="shorter" value=" ↑ "
-
onclick="changeSize1(document.getElementById('template_bean_contents'), -5)" />
+ onclick="changeSize1($('template_bean_contents'), -5)"
/>
</td>
</tr>
</table>
@@ -168,12 +168,12 @@
<td class="field">
<script type="text/javascript"><!--
function showContentTypeField() {
- if
(document.getElementById('template_bean_autoContentType1').checked) {
-
document.getElementById('template_bean_manualContentType').readOnly = true;
-
document.getElementById('template_bean_manualContentType').style.background =
'#e5e5e5';
+ if ($('template_bean_autoContentType1').checked) {
+ $('template_bean_manualContentType').readOnly
= true;
+
$('template_bean_manualContentType').style.background = '#e5e5e5';
} else {
-
document.getElementById('template_bean_manualContentType').readOnly = false;
-
document.getElementById('template_bean_manualContentType').style.background =
'#ffffff';
+ $('template_bean_manualContentType').readOnly
= false;
+
$('template_bean_manualContentType').style.background = '#ffffff';
}
}
// --></script>
Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/ThemeEdit.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/ThemeEdit.jsp?view=diff&rev=544632&r1=544631&r2=544632
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/ThemeEdit.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/ThemeEdit.jsp Tue Jun
5 14:05:41 2007
@@ -28,25 +28,19 @@
window.open('<s:url
value="/roller-ui/authoring/preview/%{actionWeblog.handle}"/>?theme='+selector.options[selected].value,
'_preview', '');
}
-function toggleThemeOptioner() {
- // just call toggle on both theme optioner choices
- new Effect.toggle('sharedThemeOptioner', 'appear');
- new Effect.toggle('customThemeOptioner', 'appear');
-}
-
function updateThemeChooser(selected) {
if(selected.value == 'shared') {
- selectedChooser = document.getElementById('sharedChooser');
- selectedOptioner = document.getElementById('sharedOptioner');
+ selectedChooser = $('sharedChooser');
+ selectedOptioner = $('sharedOptioner');
- otherChooser = document.getElementById('customChooser');
- otherOptioner = document.getElementById('customOptioner');
+ otherChooser = $('customChooser');
+ otherOptioner = $('customOptioner');
} else {
- selectedChooser = document.getElementById('customChooser');
- selectedOptioner = document.getElementById('customOptioner');
+ selectedChooser = $('customChooser');
+ selectedOptioner = $('customOptioner');
- otherChooser = document.getElementById('sharedChooser');
- otherOptioner = document.getElementById('sharedOptioner');
+ otherChooser = $('sharedChooser');
+ otherOptioner = $('sharedOptioner');
}
// update styling on chooser
@@ -56,8 +50,8 @@
otherChooser.style.border="1px solid grey";
// update display of selected optioner
- otherOptioner.style.display="none";
- selectedOptioner.style.display="block";
+ otherOptioner.hide();
+ selectedOptioner.show();
}
-->
</script>
@@ -92,22 +86,22 @@
<p><s:text name="themeEditor.yourCurrentTheme" />: <b><s:property
value="actionWeblog.theme.name"/></b></p>
<p>
- <s:select id="sharedSelector" name="themeId" list="themes"
listKey="id" listValue="name" size="1"
onchange="previewImage(document.getElementById('sharedPreviewImg'),
this[selectedIndex].value)"/>
+ <s:select id="sharedSelector" name="themeId" list="themes"
listKey="id" listValue="name" size="1"
onchange="previewImage($('sharedPreviewImg'), this[selectedIndex].value)"/>
</p>
<p>
<img id="sharedPreviewImg" src="" />
<!-- initialize preview image at page load -->
<script type="text/javascript">
<s:if test="customTheme">
- previewImage(document.getElementById('sharedPreviewImg'),
'<s:property value="themes[0].id"/>');
+ previewImage($('sharedPreviewImg'), '<s:property
value="themes[0].id"/>');
</s:if>
<s:else>
- previewImage(document.getElementById('sharedPreviewImg'),
'<s:property value="themeId"/>');
+ previewImage($('sharedPreviewImg'), '<s:property
value="themeId"/>');
</s:else>
</script>
</p>
<p>
- » <a href="#"
onclick="fullPreview(document.getElementById('sharedSelector'))"><s:text
name="themeEditor.previewLink" /></a><br/>
+ » <a href="#"
onclick="fullPreview($('sharedSelector'))"><s:text
name="themeEditor.previewLink" /></a><br/>
<s:text name="themeEditor.previewDescription" />
</p>
@@ -129,17 +123,17 @@
<span class="warning"><s:text name="themeEditor.importWarning"
/></span>
</p>
<p>
- <s:select id="customSelector" name="importThemeId" list="themes"
listKey="id" listValue="name" size="1"
onchange="previewImage(document.getElementById('customPreviewImg'),
this[selectedIndex].value)"/>
+ <s:select id="customSelector" name="importThemeId" list="themes"
listKey="id" listValue="name" size="1"
onchange="previewImage($('customPreviewImg'), this[selectedIndex].value)"/>
</p>
<p>
<img id="customPreviewImg" src="" />
<!-- initialize preview image at page load -->
<script type="text/javascript">
- previewImage(document.getElementById('customPreviewImg'),
'<s:property value="themes[0].id"/>');
+ previewImage($('customPreviewImg'), '<s:property
value="themes[0].id"/>');
</script>
</p>
<p>
- » <a href="#"
onclick="fullPreview(document.getElementById('customSelector'))"><s:text
name="themeEditor.previewLink" /></a><br/>
+ » <a href="#"
onclick="fullPreview($('customSelector'))"><s:text
name="themeEditor.previewLink" /></a><br/>
<s:text name="themeEditor.previewDescription" />
</p>
<p><s:submit key="themeEditor.save" /></p>
@@ -150,9 +144,9 @@
<%-- initializes the chooser/optioner display at page load time --%>
<script type="text/javascript">
<s:if test="customTheme">
- updateThemeChooser(document.getElementById('customRadio'));
+ updateThemeChooser($('customRadio'));
</s:if>
<s:else>
- updateThemeChooser(document.getElementById('sharedRadio'));
+ updateThemeChooser($('sharedRadio'));
</s:else>
</script>
Modified:
roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/ThemeEditSharedThemesOnly.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/ThemeEditSharedThemesOnly.jsp?view=diff&rev=544632&r1=544631&r2=544632
==============================================================================
---
roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/ThemeEditSharedThemesOnly.jsp
(original)
+++
roller/trunk/apps/weblogger/web/WEB-INF/jsps/editor/ThemeEditSharedThemesOnly.jsp
Tue Jun 5 14:05:41 2007
@@ -24,8 +24,8 @@
}
function fullPreview() {
- selected=document.getElementById('themeEdit_themeId').selectedIndex;
- window.open('<s:url
value="/roller-ui/authoring/preview/%{actionWeblog.handle}"/>?theme='+document.getElementById('themeEdit_themeId').options[selected].value,
'_preview', '');
+ selected=$('themeEdit_themeId').selectedIndex;
+ window.open('<s:url
value="/roller-ui/authoring/preview/%{actionWeblog.handle}"/>?theme='+$('themeEdit_themeId').options[selected].value,
'_preview', '');
}
-->
</script>
@@ -44,13 +44,13 @@
<div>
<p>
- <s:select name="themeId" list="themes" listKey="id"
listValue="name" size="1"
onchange="previewImage(document.getElementById('previewImg'),
this[selectedIndex].value)"/>
+ <s:select name="themeId" list="themes" listKey="id"
listValue="name" size="1" onchange="previewImage($('previewImg'),
this[selectedIndex].value)"/>
</p>
<p>
<img id="previewImg" src="" />
<!-- initialize preview image at page load -->
<script type="text/javascript">
- previewImage(document.getElementById('previewImg'), '<s:property
value="themeId"/>');
+ previewImage($('previewImg'), '<s:property value="themeId"/>');
</script>
</p>
<p>
Modified: roller/trunk/apps/weblogger/web/WEB-INF/jsps/tiles/head.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/jsps/tiles/head.jsp?view=diff&rev=544632&r1=544631&r2=544632
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/jsps/tiles/head.jsp (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/jsps/tiles/head.jsp Tue Jun 5
14:05:41 2007
@@ -12,3 +12,5 @@
href="<%= request.getContextPath() %>/roller-ui/theme/<s:property
value="getProp('editor.theme')"/>/colors.css" />
<script type="text/javascript" src="<s:url value="/theme/scripts/roller.js"
/>"></script>
+
+<script type="text/javascript" src="<s:url
value="/roller-ui/scripts/scriptaculous/prototype.js"/>" ></script>
