You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2006/10/08 21:42:36 UTC
svn commit: r454196 - in /incubator/roller/trunk: metadata/xdoclet/
src/org/apache/roller/ui/authoring/struts/actions/
src/org/apache/roller/ui/core/ src/org/apache/roller/ui/core/tags/menu/
web/WEB-INF/ web/WEB-INF/classes/ web/WEB-INF/jsps/authoring/
Author: snoopdave
Date: Sun Oct 8 12:42:35 2006
New Revision: 454196
URL: http://svn.apache.org/viewvc?view=rev&rev=454196
Log:
I18N and bug fixes in bookmark management page from Jian Lui
Modified:
incubator/roller/trunk/metadata/xdoclet/global-forwards.xml
incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BookmarkEditAction.java
incubator/roller/trunk/src/org/apache/roller/ui/core/RollerRequest.java
incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/BaseRollerMenu.java
incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties
incubator/roller/trunk/web/WEB-INF/editor-menu.xml
incubator/roller/trunk/web/WEB-INF/jsps/authoring/BookmarksForm.jsp
incubator/roller/trunk/web/WEB-INF/jsps/authoring/WeblogEdit.jsp
incubator/roller/trunk/web/WEB-INF/jsps/authoring/import.jsp
Modified: incubator/roller/trunk/metadata/xdoclet/global-forwards.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/metadata/xdoclet/global-forwards.xml?view=diff&rev=454196&r1=454195&r2=454196
==============================================================================
--- incubator/roller/trunk/metadata/xdoclet/global-forwards.xml (original)
+++ incubator/roller/trunk/metadata/xdoclet/global-forwards.xml Sun Oct 8 12:42:35 2006
@@ -32,6 +32,7 @@
<forward name="categoryDelete" path="/roller-ui/authoring/categoryDelete.do"/>
<forward name="bookmarks" path="/roller-ui/authoring/bookmarks.do?method=selectFolder"/>
<forward name="folderEdit" path="/roller-ui/authoring/folderEdit.do"/>
+<forward name="bookmarkEdit" path="/roller-ui/authoring/bookmarkEdit"/>
<forward name="importBookmarks" path="/roller-ui/authoring/importBookmarks.do"/>
<forward name="uploadFiles" path="/roller-ui/authoring/uploadFiles.do"/>
<forward name="referers" path="/roller-ui/authoring/referers.do"/>
Modified: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BookmarkEditAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BookmarkEditAction.java?view=diff&rev=454196&r1=454195&r2=454196
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BookmarkEditAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/BookmarkEditAction.java Sun Oct 8 12:42:35 2006
@@ -70,9 +70,10 @@
// Pass bookmark's Folder on as attribute.
parentFolder = bd.getFolder();
-
- request.setAttribute("model", new BasePageModel(
- "bookmarkForm.edit.title", request, response, mapping));
+ BasePageModel pageModel = new BasePageModel(
+ "bookmarkForm.edit.title", request, response, mapping);
+ pageModel.setWebsite(parentFolder.getWebsite());
+ request.setAttribute("model", pageModel);
}
else if (null != request.getParameter("correct"))
{
@@ -80,10 +81,11 @@
request.setAttribute("state","correcting");
// Folder is specified by request param, pass it on as attribute.
- parentFolder = bmgr.getFolder(rreq.getFolder().getId());
-
- request.setAttribute("model", new BasePageModel(
- "bookmarkForm.correct.title", request, response, mapping));
+ parentFolder = rreq.getFolder();
+ BasePageModel pageModel = new BasePageModel(
+ "bookmarkForm.correct.title", request, response, mapping);
+ pageModel.setWebsite(parentFolder.getWebsite());
+ request.setAttribute("model", pageModel);
}
else
{
@@ -91,10 +93,11 @@
request.setAttribute("state","add");
// Folder is specified by request param, pass it on as attribute.
- parentFolder = bmgr.getFolder(rreq.getFolder().getId());
-
- request.setAttribute("model", new BasePageModel(
- "bookmarkForm.add.title", request, response, mapping));
+ parentFolder = rreq.getFolder();
+ BasePageModel pageModel = new BasePageModel(
+ "bookmarkForm.add.title", request, response, mapping);
+ pageModel.setWebsite(parentFolder.getWebsite());
+ request.setAttribute("model", pageModel);
}
// Build folder path for display on page
Modified: incubator/roller/trunk/src/org/apache/roller/ui/core/RollerRequest.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/core/RollerRequest.java?view=diff&rev=454196&r1=454195&r2=454196
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/core/RollerRequest.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/RollerRequest.java Sun Oct 8 12:42:35 2006
@@ -319,6 +319,7 @@
String handle = mRequest.getParameter(RequestConstants.WEBLOG);
String websiteid = mRequest.getParameter(RequestConstants.WEBLOG_ID);
+ FolderData folder = getFolder();
if (handle != null && mWebsite == null)
{
mWebsite = userMgr.getWebsiteByHandle(handle);
@@ -326,6 +327,10 @@
else if (websiteid != null && mWebsite == null )
{
mWebsite = userMgr.getWebsite(websiteid);
+ }
+ else if (folder != null && mWebsite == null )
+ {
+ mWebsite = folder.getWebsite();
}
// Look for page ID in request params
Modified: incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/BaseRollerMenu.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/BaseRollerMenu.java?view=diff&rev=454196&r1=454195&r2=454196
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/BaseRollerMenu.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/tags/menu/BaseRollerMenu.java Sun Oct 8 12:42:35 2006
@@ -31,6 +31,7 @@
import org.apache.roller.model.Roller;
import org.apache.roller.model.RollerFactory;
import org.apache.roller.pojos.FolderData;
+import org.apache.roller.pojos.BookmarkData;
import org.apache.roller.pojos.PermissionsData;
import org.apache.roller.pojos.UserData;
import org.apache.roller.pojos.WeblogCategoryData;
@@ -243,6 +244,13 @@
} else if (request.getParameter(RequestConstants.FOLDER_ID) != null) {
String folderId = request.getParameter(RequestConstants.FOLDER_ID);
FolderData folder = roller.getBookmarkManager().getFolder(folderId);
+ if(folder != null) {
+ weblog = folder.getWebsite();
+ }
+ } else if (request.getParameter(RequestConstants.BOOKMARK_ID) != null) {
+ String bookmarkId = request.getParameter(RequestConstants.BOOKMARK_ID);
+ BookmarkData bookmark = roller.getBookmarkManager().getBookmark(bookmarkId);
+ FolderData folder = bookmark.getFolder();
if(folder != null) {
weblog = folder.getWebsite();
}
Modified: incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties?view=diff&rev=454196&r1=454195&r2=454196
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/ApplicationResources.properties Sun Oct 8 12:42:35 2006
@@ -69,11 +69,13 @@
bookmarksForm.checkAll=Select All
bookmarksForm.checkNone=Select None
bookmarksForm.delete=Delete selected
+bookmarksForm.delete.confirm=Delete selected bookmarks?
bookmarksForm.description=Description
bookmarksForm.folder=Bookmark Folder
bookmarksForm.edit=Edit
bookmarksForm.edit.tip=Click to edit this folder or bookmark
bookmarksForm.move=Move selected
+bookmarksForm.move.confirm=Move selected bookmarks?
bookmarksForm.name=Name
bookmarksForm.path=Path
bookmarksForm.visitLink=Visit
@@ -94,6 +96,7 @@
other bookmark folders if you wish.
bookmarksImport.imported=Imported OPML bookmarks into folder [{0}]
bookmarksImport.error=Error importing bookmarks: {0}
+bookmarksImport.import=Import
# ----------------------------------------------------------------- cacheInfo.jsp
Modified: incubator/roller/trunk/web/WEB-INF/editor-menu.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/web/WEB-INF/editor-menu.xml?view=diff&rev=454196&r1=454195&r2=454196
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/editor-menu.xml (original)
+++ incubator/roller/trunk/web/WEB-INF/editor-menu.xml Sun Oct 8 12:42:35 2006
@@ -33,7 +33,7 @@
<menu-item forward="categories" name="tabbedmenu.weblog.categories"
subforwards="categoryEdit,categoryDelete" />
<menu-item forward="bookmarks" name="tabbedmenu.bookmarks.allFolders"
- subforwards="importBookmarks" />
+ subforwards="importBookmarks,bookmarkEdit,folderEdit" />
<menu-item forward="uploadFiles" name="tabbedmenu.website.files" />
<menu-item forward="referers" name="tabbedmenu.weblog.referers" />
</menu>
Modified: incubator/roller/trunk/web/WEB-INF/jsps/authoring/BookmarksForm.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/web/WEB-INF/jsps/authoring/BookmarksForm.jsp?view=diff&rev=454196&r1=454195&r2=454196
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/jsps/authoring/BookmarksForm.jsp (original)
+++ incubator/roller/trunk/web/WEB-INF/jsps/authoring/BookmarksForm.jsp Sun Oct 8 12:42:35 2006
@@ -32,7 +32,7 @@
}
function onDelete()
{
- if ( confirm("Delete selected bookmarks?") )
+ if ( confirm("<fmt:message key='bookmarksForm.delete.confirm' />") )
{
document.bookmarksForm.method.value = "deleteSelected";
document.bookmarksForm.submit();
@@ -40,7 +40,7 @@
}
function onMove()
{
- if ( confirm("Move selected bookmarks?") )
+ if ( confirm("<fmt:message key='bookmarksForm.move.confirm' />") )
{
document.bookmarksForm.method.value = "moveSelected";
document.bookmarksForm.submit();
Modified: incubator/roller/trunk/web/WEB-INF/jsps/authoring/WeblogEdit.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/web/WEB-INF/jsps/authoring/WeblogEdit.jsp?view=diff&rev=454196&r1=454195&r2=454196
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/jsps/authoring/WeblogEdit.jsp (original)
+++ incubator/roller/trunk/web/WEB-INF/jsps/authoring/WeblogEdit.jsp Sun Oct 8 12:42:35 2006
@@ -22,15 +22,12 @@
<%
WeblogEntryPageModel model = (WeblogEntryPageModel)request.getAttribute("model");
try {
-%>
-<script type="text/javascript" src="<%= request.getContextPath() %>/roller-ui/scripts/scriptaculous/prototype.js" ></script>
-<script type="text/javascript" src="<%= request.getContextPath() %>/roller-ui/scripts/scriptaculous/scriptaculous.js" ></script>
-<script type="text/javascript" src="<%= request.getContextPath() %>/roller-ui/scripts/roller-autocomplete.js" ></script>
+%>
+<script type="text/javascript" src="<%= request.getContextPath() %>/roller-ui/scripts/scriptaculous/prototype.js" ></script>
+<script type="text/javascript" src="<%= request.getContextPath() %>/roller-ui/scripts/scriptaculous/scriptaculous.js" ></script>
+<script type="text/javascript" src="<%= request.getContextPath() %>/roller-ui/scripts/roller-autocomplete.js" ></script>
<script type="text/javascript">
<!--
-function postWeblogEntry() {
- document.weblogEntryFormEx.submit();
-}
function previewMode() {
document.weblogEntryFormEx.method.value = "preview";
postWeblogEntry();
@@ -144,26 +141,39 @@
<span style="color:red; font-weight:bold"><fmt:message key="weblogEdit.unsaved" /></span>
</c:if>
</td></tr>
-
+
+ <c:if test="${!empty weblogEntryFormEx.id}">
+ <tr><td class="entryEditFormLabel">
+ <label for="categoryId">
+ <fmt:message key="weblogEdit.permaLink" />
+ </label>
+ </td><td>
+ <a href='<c:out value="${model.permaLink}" />'>
+ <c:out value="${model.permaLink}" />
+ </a>
+ </td></tr>
+ </c:if>
+
<tr><td class="entryEditFormLabel">
<label for="categoryId"><fmt:message key="weblogEdit.category" /></label>
</td><td>
<html:select property="categoryId" size="1" tabindex="4">
<html:optionsCollection name="model" property="categories" value="id" label="path" />
</html:select>
- </td></tr>
-
- <tr><td class="entryEditFormLabel">
- <label style="width:10%; float:left;" for="title"><fmt:message key="weblogEdit.tags" /></label>
- </td><td>
- <html:text styleId="entryEditTags" property="tagsAsString" size="70" maxlength="255" tabindex="2" />
- <div id="entryEditTagsChoices" style="display:none" class="autocomplete"></div>
- <br/>
- <script type="text/javascript">
- <!--
- new RollerTagsAutoCompleter("entryEditTags", "entryEditTagsChoices", "<%= request.getContextPath() %>/roller-services/json/tags/<%= model.getWeblogEntry().getWebsite().getHandle() %>", { tokens : [' ',','], minChars: 2 });
- // --></script>
- </td></tr>
+ </td></tr>
+
+ <tr><td class="entryEditFormLabel">
+ <label style="width:10%; float:left;" for="title"><fmt:message key="weblogEdit.tags" /></label>
+ </td><td>
+ <html:text styleId="entryEditTags" property="tagsAsString" size="70" maxlength="255" tabindex="2" />
+ <div id="entryEditTagsChoices" style="display:none" class="autocomplete"></div>
+ <br/>
+ <script type="text/javascript">
+ <!--
+ new RollerTagsAutoCompleter("entryEditTags", "entryEditTagsChoices", "<%= request.getContextPath() %>/roller-services/json/tags/<%= model.getWeblogEntry().getWebsite().getHandle() %>", { tokens : [' ',','], minChars: 2 });
+ // --></script>
+ </td></tr>
+
<c:choose>
<c:when test="${model.weblog.enableMultiLang}">
<tr><td class="entryEditFormLabel">
@@ -179,41 +189,6 @@
</c:otherwise>
</c:choose>
- <tr>
- <td class="entryEditFormLabel">
- <label for="link"><fmt:message key="weblogEdit.pubTime" /></label>
- </td>
- <td>
- <div>
- <html:select property="hours">
- <html:options name="model" property="hoursList" />
- </html:select>
- :
- <html:select property="minutes" >
- <html:options name="model" property="minutesList" />
- </html:select>
- :
- <html:select property="seconds">
- <html:options name="model" property="secondsList" />
- </html:select>
-
- <roller:Date property="dateString" dateFormat='<%= model.getShortDateFormat() %>' />
- <c:out value="${model.weblogEntry.website.timeZone}" />
- </div>
- </td></tr>
-
- <c:if test="${!empty weblogEntryFormEx.id}">
- <tr><td class="entryEditFormLabel">
- <label for="categoryId">
- <fmt:message key="weblogEdit.permaLink" />
- </label>
- </td><td>
- <a href='<c:out value="${model.permaLink}" />'>
- <c:out value="${model.permaLink}" />
- </a>
- </td></tr>
- </c:if>
-
</table>
@@ -249,12 +224,117 @@
<roller:ShowEntryContent name="model" property="weblogEntry" />
</div>
</c:if>
+ <br />
+
+ <%-- ================================================================== --%>
+ <%-- plugin chooser --%>
+ <c:if test="${model.hasPagePlugins}">
+ <div id="pluginControlToggle" class="controlToggle">
+ <span id="ipluginControl">+</span>
+ <a class="controlToggle" onclick="javascript:toggleControl('pluginControlToggle','pluginControl')">
+ <fmt:message key="weblogEdit.pluginsToApply" /></a>
+ </div>
+ <div id="pluginControl" class="miscControl" style="display:none">
+ <logic:iterate id="plugin" type="org.apache.roller.model.WeblogEntryPlugin"
+ collection="<%= model.getPagePlugins() %>">
+ <html:multibox property="pluginsArray"
+ title="<%= plugin.getName() %>" value="<%= plugin.getName() %>"
+ styleId="<%= plugin.getName() %>"/></input>
+ <label for="<%= plugin.getName() %>"><%= plugin.getName() %></label>
+ <a href="javascript:void(0);" onmouseout="return nd();"
+ onmouseover="return overlib('<%= plugin.getDescription() %>', STICKY, MOUSEOFF, TIMEOUT, 3000);">?</a>
+ <br />
+ </logic:iterate>
+ </div>
+ </c:if>
+
+ <%-- ================================================================== --%>
+ <%-- advanced settings --%>
+
+ <div id="miscControlToggle" class="controlToggle">
+ <span id="imiscControl">+</span>
+ <a class="controlToggle" onclick="javascript:toggleControl('miscControlToggle','miscControl')">
+ <fmt:message key="weblogEdit.miscSettings" /></a>
+ </div>
+ <div id="miscControl" class="miscControl" style="display:none">
+
+ <label for="link"><fmt:message key="weblogEdit.pubTime" /></label>
+ <div>
+ <html:select property="hours">
+ <html:options name="model" property="hoursList" />
+ </html:select>
+ :
+ <html:select property="minutes" >
+ <html:options name="model" property="minutesList" />
+ </html:select>
+ :
+ <html:select property="seconds">
+ <html:options name="model" property="secondsList" />
+ </html:select>
+
+ <roller:Date property="dateString" dateFormat='<%= model.getShortDateFormat() %>' />
+ <c:out value="${model.weblogEntry.website.timeZone}" />
+ </div>
+ <br />
- <%-- ================================================================== --%>
+ <html:checkbox property="allowComments" onchange="onAllowCommentsChange()" />
+ <fmt:message key="weblogEdit.allowComments" />
+ <fmt:message key="weblogEdit.commentDays" />
+ <html:select property="commentDays">
+ <html:option key="weblogEdit.unlimitedCommentDays" value="0" />
+ <html:option key="weblogEdit.days1" value="1" />
+ <html:option key="weblogEdit.days2" value="2" />
+ <html:option key="weblogEdit.days3" value="3" />
+ <html:option key="weblogEdit.days4" value="4" />
+ <html:option key="weblogEdit.days5" value="5" />
+ <html:option key="weblogEdit.days7" value="7" />
+ <html:option key="weblogEdit.days10" value="10" />
+ <html:option key="weblogEdit.days20" value="20" />
+ <html:option key="weblogEdit.days30" value="30" />
+ <html:option key="weblogEdit.days60" value="60" />
+ <html:option key="weblogEdit.days90" value="90" />
+ </html:select>
+ <br />
+
+ <html:checkbox property="rightToLeft" />
+ <fmt:message key="weblogEdit.rightToLeft" />
+ <br />
+
+ <c:if test="${model.rollerSession.globalAdminUser}">
+ <html:checkbox property="pinnedToMain" />
+ <fmt:message key="weblogEdit.pinnedToMain" />
+ <br />
+ </c:if>
+ <c:if test="${!model.rollerSession.globalAdminUser}">
+ <html:hidden property="pinnedToMain" />
+ </c:if>
+ <br />
+
+ <%
+ WeblogEntryFormEx form = model.getWeblogEntryForm();
+ String att_url = (String)form.getAttributes().get("att_mediacast_url");
+ att_url = (att_url == null) ? "" : att_url;
+ %>
+ <fmt:message key="weblogEdit.enclosureURL" />: <input name="att_mediacast_url" type="text" size="40" maxlength="255" value='<%= att_url %>' />
+ <%
+ String att_type = (String)form.getAttributes().get("att_mediacast_type");
+ String att_length = (String)form.getAttributes().get("att_mediacast_length");
+ %>
+ <% if (att_url != null && att_type != null && att_length != null) { %>
+ <fmt:message key="weblogEdit.enclosureType" />: <%= att_type %>
+ <fmt:message key="weblogEdit.enclosureLength" />: <%= att_length %>
+ <% } else if (att_url != null && att_url.trim().length()!=0) { %>
+ <span style="color:red"><fmt:message key="weblogEdit.enclosureInvalid" /></span>
+ <% } %>
+
+ </div>
+
+
+ <%-- ================================================================== --%>
<%-- the button box --%>
- <br></br>
+ <br>
<div class="control">
<%-- save draft and post buttons: only in edit and preview mode --%>
@@ -313,118 +393,7 @@
</c:if>
</div>
-
-
- <%-- ================================================================== --%>
- <%-- Other settings --%>
-
- <h2><fmt:message key="weblogEdit.otherSettings" /></h2>
-
- <%-- ================================================================== --%>
- <%-- comment settings --%>
- <div id="commentControlToggle" class="controlToggle">
- <span id="icommentControl">+</span>
- <a class="controlToggle" onclick="javascript:toggleControl('commentControlToggle','commentControl')">
- <fmt:message key="weblogEdit.commentSettings" />
- </a>
- </div>
- <div id="commentControl" class="miscControl" style="display:none">
- <html:checkbox property="allowComments" onchange="onAllowCommentsChange()" />
- <fmt:message key="weblogEdit.allowComments" />
- <fmt:message key="weblogEdit.commentDays" />
- <html:select property="commentDays">
- <html:option key="weblogEdit.unlimitedCommentDays" value="0" />
- <html:option key="weblogEdit.days1" value="1" />
- <html:option key="weblogEdit.days2" value="2" />
- <html:option key="weblogEdit.days3" value="3" />
- <html:option key="weblogEdit.days4" value="4" />
- <html:option key="weblogEdit.days5" value="5" />
- <html:option key="weblogEdit.days7" value="7" />
- <html:option key="weblogEdit.days10" value="10" />
- <html:option key="weblogEdit.days20" value="20" />
- <html:option key="weblogEdit.days30" value="30" />
- <html:option key="weblogEdit.days60" value="60" />
- <html:option key="weblogEdit.days90" value="90" />
- </html:select>
- <br />
- </div>
-
- <%-- ================================================================== --%>
- <%-- plugin chooser --%>
-
- <c:if test="${model.hasPagePlugins}">
- <div id="pluginControlToggle" class="controlToggle">
- <span id="ipluginControl">+</span>
- <a class="controlToggle" onclick="javascript:toggleControl('pluginControlToggle','pluginControl')">
- <fmt:message key="weblogEdit.pluginsToApply" /></a>
- </div>
- <div id="pluginControl" class="miscControl" style="display:none">
- <logic:iterate id="plugin" type="org.apache.roller.model.WeblogEntryPlugin"
- collection="<%= model.getPagePlugins() %>">
- <html:multibox property="pluginsArray"
- title="<%= plugin.getName() %>" value="<%= plugin.getName() %>"
- styleId="<%= plugin.getName() %>"/></input>
- <label for="<%= plugin.getName() %>"><%= plugin.getName() %></label>
- <a href="javascript:void(0);" onmouseout="return nd();"
- onmouseover="return overlib('<%= plugin.getDescription() %>', STICKY, MOUSEOFF, TIMEOUT, 3000);">?</a>
- <br />
- </logic:iterate>
- </div>
- </c:if>
-
- <%-- ================================================================== --%>
- <%-- misc settings --%>
-
- <div id="miscControlToggle" class="controlToggle">
- <span id="imiscControl">+</span>
- <a class="controlToggle" onclick="javascript:toggleControl('miscControlToggle','miscControl')">
- <fmt:message key="weblogEdit.miscSettings" /></a>
- </div>
- <div id="miscControl" class="miscControl" style="display:none">
-
- <html:checkbox property="rightToLeft" />
- <fmt:message key="weblogEdit.rightToLeft" />
- <br />
-
- <c:if test="${model.rollerSession.globalAdminUser}">
- <html:checkbox property="pinnedToMain" />
- <fmt:message key="weblogEdit.pinnedToMain" />
- <br />
- </c:if>
- <c:if test="${!model.rollerSession.globalAdminUser}">
- <html:hidden property="pinnedToMain" />
- </c:if>
-
- </div>
-
- <%-- ================================================================== --%>
- <%-- MediaCast settings --%>
-
- <div id="mediaCastControlToggle" class="controlToggle">
- <span id="imediaCastControl">+</span>
- <a class="controlToggle" onclick="javascript:toggleControl('mediaCastControlToggle','mediaCastControl')">
- MediaCast Settings</a>
- </div>
- <div id="mediaCastControl" class="miscControl" style="display:none">
- <%
- WeblogEntryFormEx form = model.getWeblogEntryForm();
- String att_url = (String)form.getAttributes().get("att_mediacast_url");
- att_url = (att_url == null) ? "" : att_url;
- %>
- <b>URL:</b> <input name="att_mediacast_url" type="text" size="80" maxlength="255" value='<%= att_url %>' />
-<%
- String att_type = (String)form.getAttributes().get("att_mediacast_type");
- String att_length = (String)form.getAttributes().get("att_mediacast_length");
-%>
-<% if (att_url != null && att_type != null && att_length != null) { %>
- <b>Type:</b> <%= att_type %>
- <b>Length:</b> <%= att_length %>
-<% } else if (att_url != null && att_url.trim().length()!=0) { %>
- <span style="color:red">MediaCast URL is invalid</span>
-<% } %>
- </div>
-
<%-- ================================================================== --%>
<%-- Trackback control --%>
Modified: incubator/roller/trunk/web/WEB-INF/jsps/authoring/import.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/web/WEB-INF/jsps/authoring/import.jsp?view=diff&rev=454196&r1=454195&r2=454196
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/jsps/authoring/import.jsp (original)
+++ incubator/roller/trunk/web/WEB-INF/jsps/authoring/import.jsp Sun Oct 8 12:42:35 2006
@@ -33,7 +33,7 @@
<html:file property="bookmarksFile" />
<br />
<br />
- <html:submit/></input>
+ <input type="submit" value="<fmt:message key='bookmarksImport.import'/>"/>
</html:form>
<%--
@@ -41,9 +41,11 @@
a name reference and IE seems to only focus on file inputs via elements[0]?
--%>
<script type="text/javascript">
-<!--
- document.forms[0].elements[0].focus();
-// -->
+ var focusControl = document.forms["folderFormEx"].elements["weblog"];
+
+ if (focusControl.type != "hidden" && !focusControl.disabled) {
+ focusControl.focus();
+ }
</script>