You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by gh...@apache.org on 2012/01/29 23:08:05 UTC
svn commit: r1237493 - in /roller/trunk:
weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/
weblogger-web/src/main/resources/
weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/
Author: ghuber
Date: Sun Jan 29 22:08:04 2012
New Revision: 1237493
URL: http://svn.apache.org/viewvc?rev=1237493&view=rev
Log:
Template testing mods.....
Modified:
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
roller/trunk/weblogger-web/src/main/resources/ApplicationResources.properties
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/StylesheetEdit.jsp
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp
Modified: roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java?rev=1237493&r1=1237492&r2=1237493&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java (original)
+++ roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java Sun Jan 29 22:08:04 2012
@@ -50,9 +50,6 @@ public class TemplateEdit extends UIActi
// the template we are working on
private WeblogTemplate template = null;
- private String type = null;
-
-
public TemplateEdit() {
this.actionName = "templateEdit";
this.desiredMenu = "editor";
@@ -209,15 +206,5 @@ public class TemplateEdit extends UIActi
public void setTemplate(WeblogTemplate template) {
this.template = template;
-
- }
-
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
}
}
\ No newline at end of file
Modified: roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java?rev=1237493&r1=1237492&r2=1237493&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java (original)
+++ roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java Sun Jan 29 22:08:04 2012
@@ -187,14 +187,14 @@ public class Templates extends UIAction
// make sure name is non-null and within proper size
if(StringUtils.isEmpty(getNewTmplName())) {
- addError("TemplateEdit.error.nameNull");
+ addError("Template.error.nameNull");
} else if(getNewTmplName().length() > 255) {
- addError("TemplateEdit.error.nameSize");
+ addError("Template.error.nameSize");
}
// make sure action is a valid
if(StringUtils.isEmpty(getNewTmplAction())) {
- addError("TemplateEdit.error.actionNull");
+ addError("Template.error.actionNull");
}
// check if template by that name already exists
Modified: roller/trunk/weblogger-web/src/main/resources/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/resources/ApplicationResources.properties?rev=1237493&r1=1237492&r2=1237493&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/resources/ApplicationResources.properties (original)
+++ roller/trunk/weblogger-web/src/main/resources/ApplicationResources.properties Sun Jan 29 22:08:04 2012
@@ -1323,7 +1323,7 @@ pageForm.save.success=Template updated s
pageForm.launch=launch
pageForm.useAutoContentType=Automatically set content type
pageForm.useManualContentType=Use manually specified content-type
-
+pageForm.notemplates=There are currently no templates defined
pageForm.templateLanguage=Template Language
pageForm.outputContentType=Content-Type
@@ -1343,7 +1343,7 @@ Template.error.nameNull=Name is a requir
Template.error.nameSize=Name cannot be more than 255 characters
Template.error.linkSize=Link cannot be more than 255 characters
Template.error.descriptionSize=Description cannot be more than 255 characters
-
+Template.error.actionNull=The Action is a required field
# ---------------------------------------------------- Ping Target Admin/Editing
@@ -1610,6 +1610,9 @@ stylesheetEdit.subtitle=Edit weblog cust
stylesheetEdit.tip=This form allows you to edit the stylesheet for your theme.
stylesheetEdit.revertTip=If you run into any problems you don''t know how to \
fix you can start over at any time by clicking the restore button.
+stylesheetEdit.revertTip1=<font color="red">If you have not customised your stylesheet here, \
+please use the <em>Shared Theme</em> default by clicking the delete stylesheet button. \
+This will ensure you are using the latest version and any changes will be picked up.</font>
stylesheetEdit.save=Save
stylesheetEdit.revert=Restore Stylesheet
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp?rev=1237493&r1=1237492&r2=1237493&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp Sun Jan 29 22:08:04 2012
@@ -1,498 +1,498 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. The ASF licenses this file to You
- under the Apache License, Version 2.0 (the "License"); you may not
- use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. For additional information regarding
- copyright in this work, please see the NOTICE file in the top level
- directory of this distribution.
---%>
-<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-
-<link rel="stylesheet" type="text/css" href="<s:url value='/roller-ui/yui/assets/skins/sam/container.css'/>" />
-<link rel="stylesheet" type="text/css" href="<s:url value='/roller-ui/yui/menu/assets/skins/sam/menu.css'/>" />
-
-<script type="text/javascript" src="<s:url value='/roller-ui/yui/yahoo-dom-event/yahoo-dom-event.js'/>"></script>
-<script type="text/javascript" src="<s:url value='/roller-ui/yui/container/container-min.js'/>"></script>
-<script type="text/javascript" src="<s:url value='/roller-ui/yui/menu/menu-min.js'/>"></script>
-<script type="text/javascript" src="<s:url value='/roller-ui/yui/element/element-min.js' />"></script>
-<script type="text/javascript" src="<s:url value='/roller-ui/yui/button/button-min.js' />"></script>
-
-<script type="text/javascript" src='<s:url value="/roller-ui/scripts/jquery-1.4.2.min.js" />'></script>
-
-
-<style>
- .mediaObject {
- width:120px;
- height:120px;
- }
- .mediaObjectInfo {
- clear:left;
- width:130px;
- margin-left:5px;
- margin-top:3px;
- font-size:11px;
- }
- .highlight {
- border: 1px solid #aaa;
- }
- #myMenu {
- margin-left: 0;
- }
- span.button {
- height:15px;
- width:15px;
- float:right;
- }
- .yui-button button {
- border-style: none;
- background-color:transparent;
- *overflow:visible;
- cursor:pointer;
- }
- .yui-menu-button button {
- width:15px; height: 15px;
- background-repeat: no-repeat;
- background-position: center;
- background-image: url(<s:url value="/images/add.png"/>);
- }
-</style>
-
-
-<script type="text/javascript">
-
- function onSelectDirectory(id) {
- window.location = "<s:url action="mediaFileView" />?directoryId=" + id + "&weblog=" + '<s:property value="actionWeblog.handle" />';
- }
-
- function onDeleteSelected() {
- if ( confirm("<s:text name='mediaFile.delete.confirm' />") ) {
- document.mediaFileViewForm.action='<s:url action="mediaFileView!deleteSelected" />';
- document.mediaFileViewForm.submit();
- }
- }
-
- function onMoveSelected() {
- if ( confirm("<s:text name='mediaFile.move.confirm' />") ) {
- document.mediaFileViewForm.action='<s:url action="mediaFileView!moveSelected" />';
- document.mediaFileViewForm.submit();
- }
- }
-
- <%-- menu button for each image, launched from the plus sign image --%>
-
- var menuButtons = {};
-
- function setupMenuButton(id) {
- if (!menuButtons[id]) {
- var mediaFileMenu = [
- { text: "<s:text name='mediaFile.createWeblogPost' />", value: 1, onclick: { fn: onCreateWeblogPost, obj:id } },
- { text: "<s:text name='mediaFile.createPodcastPost' />", value: 2, onclick: { fn: onCreatePodcastPost, obj:id } }
- ];
- menuButtons[id] = new YAHOO.widget.Button({
- type: "menu", label: "", name: id,
- menu: mediaFileMenu, container: 'addbutton-' + id });
- $('#addbutton-img' + id).hide();
- }
- }
-
- function onCreateWeblogPost(p_sType, p_aArgs, id) {
- $("#selectedImage").get(0).value = id;
- $("#type").get(0).value = 'weblog';
- $("#createPostForm").get(0).submit();
- }
-
- function onCreatePodcastPost(p_sType, p_aArgs, id) {
- $("#selectedImage").get(0).value = id;
- $("#type").get(0).value = 'podcast';
- $("#createPostForm").get(0).submit();
- }
-
-
- <%-- launch modal "lightbox" Media File Edit page --%>
-
- function onClickEdit(mediaFileId) {
- <s:url id="mediaFileEditURL" action="mediaFileEdit">
- <s:param name="weblog" value="%{actionWeblog.handle}" />
- </s:url>
- $("#mediaFileEditor").attr('src',
- '<s:property value="%{mediaFileEditURL}" />' + '&mediaFileId=' + mediaFileId);
- YAHOO.mediaFileEditor.lightbox.show();
- }
-
- function onEditSuccess() {
- $("#mediaFileEditor").attr('src','about:blank');
- YAHOO.mediaFileEditor.lightbox.hide();
- window.location.reload();
- }
-
- function onEditCancelled() {
- $("#mediaFileEditor").attr('src','about:blank');
- YAHOO.mediaFileEditor.lightbox.hide();
- }
-
- YAHOO.namespace("mediaFileEditor");
- $(document).ready(function() {
- YAHOO.mediaFileEditor.lightbox = new YAHOO.widget.Panel(
- "mediafile_edit_lightbox", {
- modal: true,
- width: "600px",
- height: "700px",
- visible: false,
- fixedcenter: true,
- constraintoviewport: true
- }
- );
- YAHOO.mediaFileEditor.lightbox.render(document.body);
- });
-
- <%-- code to toggle buttons on/off as media file/directory selections change --%>
-
- $(document).ready(function() {
- $("#deleteButton").attr('disabled',true)
- $("#moveButton").attr('disabled',true)
- $("#moveTargetMenu").attr('disabled',true)
-
- $("input[type=checkbox]").change(function() {
- var count = 0;
- $("input[type=checkbox]").each(function(index, element) {
- if (element.checked) count++;
- });
- if (count == 0) {
- $("#deleteButton").attr('disabled',true)
- $("#moveButton").attr('disabled',true)
- $("#moveTargetMenu").attr('disabled',true)
- } else {
- $("#deleteButton").attr('disabled',false)
- $("#moveButton").attr('disabled',false)
- $("#moveTargetMenu").attr('disabled',false)
- }
- });
- });
-</script>
-
-
-<s:form id="createPostForm" action='entryAddWithMediaFile'>
- <input type="hidden" name="weblog" value='<s:property value="actionWeblog.handle" />' />
- <input type="hidden" name="selectedImage" id="selectedImage" />
- <input type="hidden" name="type" id="type" />
-</s:form>
-
-
-<%-- ********************************************************************* --%>
-
-<%-- Subtitle and folder path --%>
-
-<s:if test='currentDirectory.path.equals("/")'>
-
- <p class="subtitle">
- <s:text name="mediaFileView.subtitle" >
- <s:param value="weblog" />
- </s:text>
- </p>
- </p>
- <p class="pagetip">
- <s:text name="mediaFileView.rootPageTip" />
- </p>
-
-</s:if>
-
-<s:elseif test='pager'>
-
- <p class="subtitle">
- <s:text name="mediaFileView.searchTitle" />
- </p>
- <p class="pagetip">
-
- <%-- display summary of the search results and terms --%>
-
- <s:if test="pager.items.size() > 0">
- <s:text name="mediaFileView.matchingResults">
- <s:param value="pager.items.size()" />
- </s:text>
- </s:if>
- <s:else>
- <s:text name="mediaFileView.noResults" />
- </s:else>
- <s:text name="mediaFileView.searchInfo" />
-
- <ul>
- <s:if test="!bean.name.isEmpty()">
- <li>
- <s:text name="mediaFileView.filesNamed">
- <s:param value="bean.name" />
- </s:text>
- </li>
- </s:if>
- <s:if test="bean.size > 0">
- <li>
- <s:text name="mediaFileView.filesOfSize">
- <s:param value='bean.sizeFilterTypeLabel' />
- <s:param value='bean.size' />
- <s:param value='bean.sizeUnitLabel' />
- </s:text>
- </li>
- </s:if>
- <s:if test="!bean.type.isEmpty()">
- <li>
- <s:text name="mediaFileView.filesOfType">
- <s:param value='bean.typeLabel' />
- </s:text>
- </li>
- </s:if>
- <s:if test="!bean.tags.isEmpty()">
- <li>
- <s:text name="mediaFileView.filesTagged">
- <s:param value="bean.tags" />
- </s:text>
- </li>
- </s:if>
- </ul>
-
- </p>
- <br />
-
-</s:elseif>
-
-<s:else>
-
- <p class="subtitle">
- <s:text name="mediaFileView.path"/> /
- <s:iterator id="directory" value="currentDirectoryHierarchy">
-
- <s:url id="getDirectoryByPathUrl" action="mediaFileView">
- <s:param name="directoryPath" value="#directory.key" />
- <s:param name="weblog" value="%{actionWeblog.handle}" />
- </s:url>
- <s:a href="%{getDirectoryByPathUrl}"><s:property value="#directory.value" /></s:a> /
-
- </s:iterator>
- </p>
- <p class="pagetip">
- <s:text name="mediaFileView.dirPageTip" />
- </p>
-
-</s:else>
-
-
-<s:if test="childFiles || childDirectories || (pager && pager.items.size() > 0)">
-
- <s:form id="mediaFileViewForm" name="mediaFileViewForm" action="mediaFileView">
- <s:hidden name="weblog" />
- <s:hidden name="directoryId" />
- <s:hidden name="newDirectoryName" />
- <input type="hidden" name="mediaFileId" value="" />
-
- <div class="control">
-
- <span style="padding-left:20px">
- <s:text name="mediaFileView.sortby" />
- <s:select id="sortByMenu" name="sortBy" list="sortOptions" listKey="key"
- listValue="value"
- onchange="document.mediaFileViewForm.submit();" />
- </span>
-
- <span style="float:right">
- <input id="deleteButton" type="button" style="padding-right:20px"
- value='<s:text name="mediaFileView.deleteSelected" />' onclick="onDeleteSelected()" />
-
- <input id="moveButton" type="button" style="padding-left:20px"
- value=<s:text name="mediaFileView.moveSelected" /> onclick="onMoveSelected()" />
-
- <s:select id="moveTargetMenu" name="selectedDirectory" list="allDirectories" listKey="id" listValue="path" />
- </span>
-
- </div>
-
-
- <%-- ***************************************************************** --%>
-
- <%-- Media file folder contents --%>
-
- <script type="text/javascript">
- function highlight(el, flag) {
- if (flag) {
- YAHOO.util.Dom.addClass(el, "highlight");
- } else {
- YAHOO.util.Dom.removeClass(el, "highlight");
- }
- }
- </script>
-
- <div width="720px" height="500px">
- <ul id = "myMenu">
-
- <s:if test="!pager">
-
- <%-- ----------------------------------------------------- --%>
-
- <%-- NOT SEARCH RESULTS --%>
-
- <s:if test="childDirectories.size() == 0 && childFiles.size() ==0">
- <p style="text-align: center"><s:text name="mediaFileView.noFiles"/></p>
- </s:if>
-
- <%-- List media directories first --%>
-
- <s:iterator id="directory" value="childDirectories">
- <li class="align-images"
- onmouseover="highlight(this, true)" onmouseout="highlight(this, false)">
- <div class="mediaObject">
- <img border="0" src='<s:url value="/images/folder.png"/>'
- class="dir-image" alt="mediaFolder.png"
- onclick="onSelectDirectory('<s:property value="#directory.id"/>')"/>
- </div>
- <div class="mediaObjectInfo">
- <input type="checkbox"
- name="selectedMediaFileDirectories"
- value="<s:property value="#directory.id"/>"/>
- <inut type="hidden" id="mediadiridentity"
- value="<s:property value='#directory.id'/>">
- <s:property value="#directory.name" />
- </div>
- </li>
- </s:iterator>
-
- <%-- List media files next --%>
-
- <s:iterator id="mediaFile" value="childFiles">
-
- <li class="align-images"
- onmouseover="highlight(this, true)" onmouseout="highlight(this, false)">
-
- <div class="mediaObject"
- onclick="onClickEdit('<s:property value="#mediaFile.id"/>')" >
-
- <s:if test="#mediaFile.imageFile">
- <img border="0" src='<s:property value="%{#mediaFile.thumbnailURL}" />'
- width='<s:property value="#mediaFile.thumbnailWidth"/>'
- height='<s:property value="#mediaFile.thumbnailHeight"/>'
- title='<s:property value="#mediaFile.name" />' />
- </s:if>
-
- <s:else>
- <s:url id="mediaFileURL" value="/images/page.png"></s:url>
- <img border="0" src='<s:property value="%{mediaFileURL}" />'
- style="padding:40px 50px;" alt="logo" />
- </s:else>
-
- </div>
-
- <div class="mediaObjectInfo"
- onmouseover='setupMenuButton("<s:property value='#mediaFile.id' />")'>
-
- <input type="checkbox"
- name="selectedMediaFiles"
- value="<s:property value="#mediaFile.id"/>" />
- <input type="hidden" id="mediafileidentity"
- value="<s:property value='#mediaFile.id'/>" />
-
- <str:truncateNicely lower="47" upper="47">
- <s:property value="#mediaFile.name" />
- </str:truncateNicely>
-
- <span class="button" id="addbutton-<s:property value='#mediaFile.id' />">
- <img id="addbutton-img<s:property value='#mediaFile.id' />"
- src="<s:url value="/images/add.png"/>" alt="logo" />
- </span>
-
- </div>
-
- </li>
-
- </s:iterator>
-
- </s:if>
-
- <s:else>
-
- <%-- ----------------------------------------------------- --%>
-
- <%-- SEARCH RESULTS --%>
-
- <s:iterator id="mediaFile" value="pager.items">
-
- <li class="align-images"
- onmouseover="highlight(this, true)" onmouseout="highlight(this, false)">
-
- <div class="mediaObject"
- onclick="onClickEdit('<s:property value="#mediaFile.id"/>')" >
-
- <s:if test="#mediaFile.imageFile">
- <img border="0" src='<s:property value="%{#mediaFile.thumbnailURL}" />'
- width='<s:property value="#mediaFile.thumbnailWidth"/>'
- height='<s:property value="#mediaFile.thumbnailHeight"/>'
- title='<s:property value="#mediaFile.name" />' />
- </s:if>
-
- <s:else>
- <s:url id="mediaFileURL" value="/images/page.png"></s:url>
- <img border="0" src='<s:property value="%{mediaFileURL}" />'
- style="padding:40px 50px;" />
- </s:else>
-
- </div>
-
- <div class="mediaObjectInfo"
- onmouseover='setupMenuButton("<s:property value='#mediaFile.id' />")'>
-
- <input type="checkbox"
- name="selectedMediaFiles"
- value="<s:property value="#mediaFile.id"/>"/>
- <input type="hidden" id="mediafileidentity"
- value="<s:property value='#mediaFile.id'/>">
-
- <str:truncateNicely lower="40" upper="50">
- <s:property value="#mediaFile.name" />
- </str:truncateNicely>
-
- <span class="button" id="addbutton-<s:property value='#mediaFile.id' />">
- <img id="addbutton-img<s:property value='#mediaFile.id' />"
- src="<s:url value="/images/add.png"/>" />
- </span>
-
- </div>
-
- </li>
-
- </s:iterator>
-
- </s:else>
-
- </ul>
- </div>
-
- <div style="clear:left;"></div>
-
-</s:form>
-
-</s:if>
-
-
-<%-- ***************************************************************** --%>
-
-<div id="mediafile_edit_lightbox" style="visibility:hidden">
- <div class="hd">Media File Editor</div>
- <div class="bd">
- <iframe id="mediaFileEditor"
- style="visibility:inherit"
- height="100%"
- width="100%"
- frameborder="no"
- scrolling="auto">
- </iframe>
- </div>
- <div class="ft"></div>
-</div>
-
-<br/>
-<br/>
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. The ASF licenses this file to You
+ under the Apache License, Version 2.0 (the "License"); you may not
+ use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. For additional information regarding
+ copyright in this work, please see the NOTICE file in the top level
+ directory of this distribution.
+--%>
+<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
+
+<link rel="stylesheet" type="text/css" href="<s:url value='/roller-ui/yui/assets/skins/sam/container.css'/>" />
+<link rel="stylesheet" type="text/css" href="<s:url value='/roller-ui/yui/menu/assets/skins/sam/menu.css'/>" />
+
+<script type="text/javascript" src="<s:url value='/roller-ui/yui/yahoo-dom-event/yahoo-dom-event.js'/>"></script>
+<script type="text/javascript" src="<s:url value='/roller-ui/yui/container/container-min.js'/>"></script>
+<script type="text/javascript" src="<s:url value='/roller-ui/yui/menu/menu-min.js'/>"></script>
+<script type="text/javascript" src="<s:url value='/roller-ui/yui/element/element-min.js' />"></script>
+<script type="text/javascript" src="<s:url value='/roller-ui/yui/button/button-min.js' />"></script>
+
+<script type="text/javascript" src='<s:url value="/roller-ui/scripts/jquery-1.4.2.min.js" />'></script>
+
+
+<style>
+ .mediaObject {
+ width:120px;
+ height:120px;
+ }
+ .mediaObjectInfo {
+ clear:left;
+ width:130px;
+ margin-left:5px;
+ margin-top:3px;
+ font-size:11px;
+ }
+ .highlight {
+ border: 1px solid #aaa;
+ }
+ #myMenu {
+ margin-left: 0;
+ }
+ span.button {
+ height:15px;
+ width:15px;
+ float:right;
+ }
+ .yui-button button {
+ border-style: none;
+ background-color:transparent;
+ *overflow:visible;
+ cursor:pointer;
+ }
+ .yui-menu-button button {
+ width:15px; height: 15px;
+ background-repeat: no-repeat;
+ background-position: center;
+ background-image: url(<s:url value="/images/add.png"/>);
+ }
+</style>
+
+
+<script type="text/javascript">
+
+ function onSelectDirectory(id) {
+ window.location = "<s:url action="mediaFileView" />?directoryId=" + id + "&weblog=" + '<s:property value="actionWeblog.handle" />';
+ }
+
+ function onDeleteSelected() {
+ if ( confirm("<s:text name='mediaFile.delete.confirm' />") ) {
+ document.mediaFileViewForm.action='<s:url action="mediaFileView!deleteSelected" />';
+ document.mediaFileViewForm.submit();
+ }
+ }
+
+ function onMoveSelected() {
+ if ( confirm("<s:text name='mediaFile.move.confirm' />") ) {
+ document.mediaFileViewForm.action='<s:url action="mediaFileView!moveSelected" />';
+ document.mediaFileViewForm.submit();
+ }
+ }
+
+ <%-- menu button for each image, launched from the plus sign image --%>
+
+ var menuButtons = {};
+
+ function setupMenuButton(id) {
+ if (!menuButtons[id]) {
+ var mediaFileMenu = [
+ { text: "<s:text name='mediaFile.createWeblogPost' />", value: 1, onclick: { fn: onCreateWeblogPost, obj:id } },
+ { text: "<s:text name='mediaFile.createPodcastPost' />", value: 2, onclick: { fn: onCreatePodcastPost, obj:id } }
+ ];
+ menuButtons[id] = new YAHOO.widget.Button({
+ type: "menu", label: "", name: id,
+ menu: mediaFileMenu, container: 'addbutton-' + id });
+ $('#addbutton-img' + id).hide();
+ }
+ }
+
+ function onCreateWeblogPost(p_sType, p_aArgs, id) {
+ $("#selectedImage").get(0).value = id;
+ $("#type").get(0).value = 'weblog';
+ $("#createPostForm").get(0).submit();
+ }
+
+ function onCreatePodcastPost(p_sType, p_aArgs, id) {
+ $("#selectedImage").get(0).value = id;
+ $("#type").get(0).value = 'podcast';
+ $("#createPostForm").get(0).submit();
+ }
+
+
+ <%-- launch modal "lightbox" Media File Edit page --%>
+
+ function onClickEdit(mediaFileId) {
+ <s:url id="mediaFileEditURL" action="mediaFileEdit">
+ <s:param name="weblog" value="%{actionWeblog.handle}" />
+ </s:url>
+ $("#mediaFileEditor").attr('src',
+ '<s:property value="%{mediaFileEditURL}" />' + '&mediaFileId=' + mediaFileId);
+ YAHOO.mediaFileEditor.lightbox.show();
+ }
+
+ function onEditSuccess() {
+ $("#mediaFileEditor").attr('src','about:blank');
+ YAHOO.mediaFileEditor.lightbox.hide();
+ window.location.reload();
+ }
+
+ function onEditCancelled() {
+ $("#mediaFileEditor").attr('src','about:blank');
+ YAHOO.mediaFileEditor.lightbox.hide();
+ }
+
+ YAHOO.namespace("mediaFileEditor");
+ $(document).ready(function() {
+ YAHOO.mediaFileEditor.lightbox = new YAHOO.widget.Panel(
+ "mediafile_edit_lightbox", {
+ modal: true,
+ width: "600px",
+ height: "700px",
+ visible: false,
+ fixedcenter: true,
+ constraintoviewport: true
+ }
+ );
+ YAHOO.mediaFileEditor.lightbox.render(document.body);
+ });
+
+ <%-- code to toggle buttons on/off as media file/directory selections change --%>
+
+ $(document).ready(function() {
+ $("#deleteButton").attr('disabled',true)
+ $("#moveButton").attr('disabled',true)
+ $("#moveTargetMenu").attr('disabled',true)
+
+ $("input[type=checkbox]").change(function() {
+ var count = 0;
+ $("input[type=checkbox]").each(function(index, element) {
+ if (element.checked) count++;
+ });
+ if (count == 0) {
+ $("#deleteButton").attr('disabled',true)
+ $("#moveButton").attr('disabled',true)
+ $("#moveTargetMenu").attr('disabled',true)
+ } else {
+ $("#deleteButton").attr('disabled',false)
+ $("#moveButton").attr('disabled',false)
+ $("#moveTargetMenu").attr('disabled',false)
+ }
+ });
+ });
+</script>
+
+
+<s:form id="createPostForm" action='entryAddWithMediaFile'>
+ <input type="hidden" name="weblog" value='<s:property value="actionWeblog.handle" />' />
+ <input type="hidden" name="selectedImage" id="selectedImage" />
+ <input type="hidden" name="type" id="type" />
+</s:form>
+
+
+<%-- ********************************************************************* --%>
+
+<%-- Subtitle and folder path --%>
+
+<s:if test='currentDirectory.path.equals("/")'>
+
+ <p class="subtitle">
+ <s:text name="mediaFileView.subtitle" >
+ <s:param value="weblog" />
+ </s:text>
+ </p>
+ </p>
+ <p class="pagetip">
+ <s:text name="mediaFileView.rootPageTip" />
+ </p>
+
+</s:if>
+
+<s:elseif test='pager'>
+
+ <p class="subtitle">
+ <s:text name="mediaFileView.searchTitle" />
+ </p>
+ <p class="pagetip">
+
+ <%-- display summary of the search results and terms --%>
+
+ <s:if test="pager.items.size() > 0">
+ <s:text name="mediaFileView.matchingResults">
+ <s:param value="pager.items.size()" />
+ </s:text>
+ </s:if>
+ <s:else>
+ <s:text name="mediaFileView.noResults" />
+ </s:else>
+ <s:text name="mediaFileView.searchInfo" />
+
+ <ul>
+ <s:if test="!bean.name.isEmpty()">
+ <li>
+ <s:text name="mediaFileView.filesNamed">
+ <s:param value="bean.name" />
+ </s:text>
+ </li>
+ </s:if>
+ <s:if test="bean.size > 0">
+ <li>
+ <s:text name="mediaFileView.filesOfSize">
+ <s:param value='bean.sizeFilterTypeLabel' />
+ <s:param value='bean.size' />
+ <s:param value='bean.sizeUnitLabel' />
+ </s:text>
+ </li>
+ </s:if>
+ <s:if test="!bean.type.isEmpty()">
+ <li>
+ <s:text name="mediaFileView.filesOfType">
+ <s:param value='bean.typeLabel' />
+ </s:text>
+ </li>
+ </s:if>
+ <s:if test="!bean.tags.isEmpty()">
+ <li>
+ <s:text name="mediaFileView.filesTagged">
+ <s:param value="bean.tags" />
+ </s:text>
+ </li>
+ </s:if>
+ </ul>
+
+ </p>
+ <br />
+
+</s:elseif>
+
+<s:else>
+
+ <p class="subtitle">
+ <s:text name="mediaFileView.path"/> /
+ <s:iterator id="directory" value="currentDirectoryHierarchy">
+
+ <s:url id="getDirectoryByPathUrl" action="mediaFileView">
+ <s:param name="directoryPath" value="#directory.key" />
+ <s:param name="weblog" value="%{actionWeblog.handle}" />
+ </s:url>
+ <s:a href="%{getDirectoryByPathUrl}"><s:property value="#directory.value" /></s:a> /
+
+ </s:iterator>
+ </p>
+ <p class="pagetip">
+ <s:text name="mediaFileView.dirPageTip" />
+ </p>
+
+</s:else>
+
+
+<s:if test="childFiles || childDirectories || (pager && pager.items.size() > 0)">
+
+ <s:form id="mediaFileViewForm" name="mediaFileViewForm" action="mediaFileView">
+ <s:hidden name="weblog" />
+ <s:hidden name="directoryId" />
+ <s:hidden name="newDirectoryName" />
+ <input type="hidden" name="mediaFileId" value="" />
+
+ <div class="control">
+
+ <span style="padding-left:20px">
+ <s:text name="mediaFileView.sortby" />
+ <s:select id="sortByMenu" name="sortBy" list="sortOptions" listKey="key"
+ listValue="value"
+ onchange="document.mediaFileViewForm.submit();" />
+ </span>
+
+ <span style="float:right">
+ <input id="deleteButton" type="button" style="padding-right:20px"
+ value='<s:text name="mediaFileView.deleteSelected" />' onclick="onDeleteSelected()" />
+
+ <input id="moveButton" type="button" style="padding-left:20px"
+ value=<s:text name="mediaFileView.moveSelected" /> onclick="onMoveSelected()" />
+
+ <s:select id="moveTargetMenu" name="selectedDirectory" list="allDirectories" listKey="id" listValue="path" />
+ </span>
+
+ </div>
+
+
+ <%-- ***************************************************************** --%>
+
+ <%-- Media file folder contents --%>
+
+ <script type="text/javascript">
+ function highlight(el, flag) {
+ if (flag) {
+ YAHOO.util.Dom.addClass(el, "highlight");
+ } else {
+ YAHOO.util.Dom.removeClass(el, "highlight");
+ }
+ }
+ </script>
+
+ <div width="720px" height="500px">
+ <ul id = "myMenu">
+
+ <s:if test="!pager">
+
+ <%-- ----------------------------------------------------- --%>
+
+ <%-- NOT SEARCH RESULTS --%>
+
+ <s:if test="childDirectories.size() == 0 && childFiles.size() ==0">
+ <p style="text-align: center"><s:text name="mediaFileView.noFiles"/></p>
+ </s:if>
+
+ <%-- List media directories first --%>
+
+ <s:iterator id="directory" value="childDirectories">
+ <li class="align-images"
+ onmouseover="highlight(this, true)" onmouseout="highlight(this, false)">
+ <div class="mediaObject">
+ <img border="0" src='<s:url value="/images/folder.png"/>'
+ class="dir-image" alt="mediaFolder.png"
+ onclick="onSelectDirectory('<s:property value="#directory.id"/>')"/>
+ </div>
+ <div class="mediaObjectInfo">
+ <input type="checkbox"
+ name="selectedMediaFileDirectories"
+ value="<s:property value="#directory.id"/>"/>
+ <inut type="hidden" id="mediadiridentity"
+ value="<s:property value='#directory.id'/>">
+ <s:property value="#directory.name" />
+ </div>
+ </li>
+ </s:iterator>
+
+ <%-- List media files next --%>
+
+ <s:iterator id="mediaFile" value="childFiles">
+
+ <li class="align-images"
+ onmouseover="highlight(this, true)" onmouseout="highlight(this, false)">
+
+ <div class="mediaObject"
+ onclick="onClickEdit('<s:property value="#mediaFile.id"/>')" >
+
+ <s:if test="#mediaFile.imageFile">
+ <img border="0" src='<s:property value="%{#mediaFile.thumbnailURL}" />'
+ width='<s:property value="#mediaFile.thumbnailWidth"/>'
+ height='<s:property value="#mediaFile.thumbnailHeight"/>'
+ title='<s:property value="#mediaFile.name" />' />
+ </s:if>
+
+ <s:else>
+ <s:url id="mediaFileURL" value="/images/page.png"></s:url>
+ <img border="0" src='<s:property value="%{mediaFileURL}" />'
+ style="padding:40px 50px;" alt="logo" />
+ </s:else>
+
+ </div>
+
+ <div class="mediaObjectInfo"
+ onmouseover='setupMenuButton("<s:property value='#mediaFile.id' />")'>
+
+ <input type="checkbox"
+ name="selectedMediaFiles"
+ value="<s:property value="#mediaFile.id"/>" />
+ <input type="hidden" id="mediafileidentity"
+ value="<s:property value='#mediaFile.id'/>" />
+
+ <str:truncateNicely lower="47" upper="47">
+ <s:property value="#mediaFile.name" />
+ </str:truncateNicely>
+
+ <span class="button" id="addbutton-<s:property value='#mediaFile.id' />">
+ <img id="addbutton-img<s:property value='#mediaFile.id' />"
+ src="<s:url value="/images/add.png"/>" alt="logo" />
+ </span>
+
+ </div>
+
+ </li>
+
+ </s:iterator>
+
+ </s:if>
+
+ <s:else>
+
+ <%-- ----------------------------------------------------- --%>
+
+ <%-- SEARCH RESULTS --%>
+
+ <s:iterator id="mediaFile" value="pager.items">
+
+ <li class="align-images"
+ onmouseover="highlight(this, true)" onmouseout="highlight(this, false)">
+
+ <div class="mediaObject"
+ onclick="onClickEdit('<s:property value="#mediaFile.id"/>')" >
+
+ <s:if test="#mediaFile.imageFile">
+ <img border="0" src='<s:property value="%{#mediaFile.thumbnailURL}" />'
+ width='<s:property value="#mediaFile.thumbnailWidth"/>'
+ height='<s:property value="#mediaFile.thumbnailHeight"/>'
+ title='<s:property value="#mediaFile.name" />' />
+ </s:if>
+
+ <s:else>
+ <s:url id="mediaFileURL" value="/images/page.png"></s:url>
+ <img border="0" src='<s:property value="%{mediaFileURL}" />'
+ style="padding:40px 50px;" />
+ </s:else>
+
+ </div>
+
+ <div class="mediaObjectInfo"
+ onmouseover='setupMenuButton("<s:property value='#mediaFile.id' />")'>
+
+ <input type="checkbox"
+ name="selectedMediaFiles"
+ value="<s:property value="#mediaFile.id"/>"/>
+ <input type="hidden" id="mediafileidentity"
+ value="<s:property value='#mediaFile.id'/>">
+
+ <str:truncateNicely lower="40" upper="50">
+ <s:property value="#mediaFile.name" />
+ </str:truncateNicely>
+
+ <span class="button" id="addbutton-<s:property value='#mediaFile.id' />">
+ <img id="addbutton-img<s:property value='#mediaFile.id' />"
+ src="<s:url value="/images/add.png"/>" />
+ </span>
+
+ </div>
+
+ </li>
+
+ </s:iterator>
+
+ </s:else>
+
+ </ul>
+ </div>
+
+ <div style="clear:left;"></div>
+
+</s:form>
+
+</s:if>
+
+
+<%-- ***************************************************************** --%>
+
+<div id="mediafile_edit_lightbox" style="visibility:hidden">
+ <div class="hd">Media File Editor</div>
+ <div class="bd">
+ <iframe id="mediaFileEditor"
+ style="visibility:inherit"
+ height="100%"
+ width="100%"
+ frameborder="no"
+ scrolling="auto">
+ </iframe>
+ </div>
+ <div class="ft"></div>
+</div>
+
+<br/>
+<br/>
<br/>
\ No newline at end of file
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/StylesheetEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/StylesheetEdit.jsp?rev=1237493&r1=1237492&r2=1237493&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/StylesheetEdit.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/StylesheetEdit.jsp Sun Jan 29 22:08:04 2012
@@ -44,8 +44,12 @@
<p class="pagetip">
<s:text name="stylesheetEdit.tip" />
- <s:if test="!customTheme"><s:text name="stylesheetEdit.revertTip" /></s:if>
- <s:if test="$(type == null)"><s:param name="type">standard</s:param></s:if>
+ <s:if test="!customTheme">
+ <s:text name="stylesheetEdit.revertTip" />
+ <s:if test="customStylesheet">
+ <br /><br /><s:text name="stylesheetEdit.revertTip1" />
+ </s:if>
+ </s:if>
</p>
<s:form action="stylesheetEdit!save">
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp?rev=1237493&r1=1237492&r2=1237493&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp Sun Jan 29 22:08:04 2012
@@ -56,7 +56,6 @@
<s:url id="edit" action="templateEdit">
<s:param name="weblog" value="actionWeblog.handle" />
<s:param name="bean.id" value="#p.id" />
- <s:param name="bean.type">standard</s:param>
</s:url>
<s:a href="%{edit}"><s:property value="#p.name" /></s:a>
</td>
@@ -83,8 +82,8 @@
</s:iterator>
<s:if test="templates.isEmpty">
<tr class="rollertable_odd">
- <td style="vertical-align:middle" colspan="3" >
- no templates defined
+ <td style="vertical-align:middle" colspan="4" >
+ <s:text name="pageForm.notemplates"/>
</td>
</tr>
</s:if>