roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject roller git commit: Finished converting Theme and Template pages to Boostrap.
Date Sun, 09 Sep 2018 18:16:41 GMT
Repository: roller
Updated Branches:
  refs/heads/bootstrap-ui de9086c75 -> 7fc12f4e6


Finished converting Theme and Template pages to Boostrap.


Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/7fc12f4e
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/7fc12f4e
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/7fc12f4e

Branch: refs/heads/bootstrap-ui
Commit: 7fc12f4e656bc13c7afe4a264ee3b3a6e2868bc2
Parents: de9086c
Author: Dave Johnson <snoopdave@gmail.com>
Authored: Sun Sep 9 14:16:38 2018 -0400
Committer: Dave Johnson <snoopdave@gmail.com>
Committed: Sun Sep 9 14:16:38 2018 -0400

----------------------------------------------------------------------
 .../webapp/WEB-INF/jsps/editor/TemplateEdit.jsp | 60 +++++++++-----------
 app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp |  1 -
 .../WEB-INF/jsps/tiles/tiles-tabbedpage.jsp     |  1 +
 3 files changed, 29 insertions(+), 33 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/roller/blob/7fc12f4e/app/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp
index f4bc097..4b738d3 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp
@@ -43,30 +43,31 @@
     <s:if test="template.required || bean.mobile">
         <%-- Cannot edit name of a reqired template --%>
         <s:textfield name="bean.name"
-            label="%{getText('generic.name')}" size="50" readonly="true" cssStyle="background:
#e5e5e5"/>
+                     label="%{getText('generic.name')}" size="50" readonly="true" cssStyle="background:
#e5e5e5"/>
     </s:if>
     <s:else>
         <s:textfield name="bean.name"
-            label="%{getText('generic.name')}" size="50"/>
+                     label="%{getText('generic.name')}" size="50"/>
     </s:else>
 
     <s:textfield name="bean.action" label="%{getText('pageForm.action')}" size="50"
-        readonly="true" cssStyle="background: #e5e5e5"/>
+                 readonly="true" cssStyle="background: #e5e5e5"/>
 
     <s:if test="!template.required && template.custom">
 
         <%-- allow setting the path for a custom template --%>
         <s:textfield name="bean.link"
-            label="%{getText('pageForm.link')}" size="50" onkeyup="updatePageURLDisplay()"/>
+                     label="%{getText('pageForm.link')}" size="50" onkeyup="updatePageURLDisplay()"/>
 
         <%-- show preview of the full URL that will result from that path --%>
 
         <div id="no_link" class="alert-danger" style="display: none; margin-top:3em; margin-bottom:2em;
padding: 1em">
-            <s:text name="pageForm.noUrl" />
+            <s:text name="pageForm.noUrl"/>
         </div>
 
-        <div id="good_link" class="alert-success" style="display: none; margin-top:3em;
margin-bottom:2em; padding: 1em">
-            <s:text name="pageForm.resultingUrlWillBe" />
+        <div id="good_link" class="alert-success"
+             style="display: none; margin-top:3em; margin-bottom:2em; padding: 1em">
+            <s:text name="pageForm.resultingUrlWillBe"/>
             <s:property value="actionWeblog.absoluteURL"/>page/
             <span id="linkPreview" style="color:red"><s:property value="bean.link"/></span>
             <s:if test="template.link != null">
@@ -79,7 +80,7 @@
     <s:if test="template.required">
         <%-- Required templates have a description--%>
         <s:textarea name="bean.description" label="%{getText('generic.description')}"
-            cols="50" rows="2" readonly="true" cssStyle="background: #e5e5e5"/>
+                    cols="50" rows="2" readonly="true" cssStyle="background: #e5e5e5"/>
     </s:if>
     <s:else>
         <s:textarea name="bean.description" label="%{getText('generic.description')}"
cols="50" rows="2"/>
@@ -126,10 +127,7 @@
 
     <s:submit value="%{getText('generic.save')}" cssClass="btn btn-default"/>
     <input type="button" value='<s:text name="generic.done"/>' class="button btn"
-           onclick="window.location='
-               <s:url action="templates">
-                   <s:param name="weblog" value="%{weblog}"/>
-               </s:url>'"/>
+           onclick="window.location='<s:url action="templates"><s:param name="weblog"
value="%{weblog}"/></s:url>'"/>
 
     <%-- ================================================================== --%>
     <%-- Advanced settings inside a control toggle --%>
@@ -154,20 +152,20 @@
                 <div class="panel-body">
 
                     <s:select name="bean.templateLanguage" list="templateLanguages" size="1"
-                              label="%{getText('pageForm.templateLanguage')}" />
+                              label="%{getText('pageForm.templateLanguage')}"/>
 
                     <s:checkbox name="bean.hidden"
-                                label="%{getText('pageForm.hidden')}" tooltip="%{getText('pageForm.hidden.tip')}"
/>
+                                label="%{getText('pageForm.hidden')}" tooltip="%{getText('pageForm.hidden.tip')}"/>
 
                     <s:checkbox name="bean.navbar"
-                                label="%{getText('pageForm.navbar')}" tooltip="%{getText('pageForm.navbar.tip')}"
/>
+                                label="%{getText('pageForm.navbar')}" tooltip="%{getText('pageForm.navbar.tip')}"/>
 
                     <s:checkbox name="bean.autoContentType"
-                                label="%{getText('pageForm.useAutoContentType')}" />
+                                label="%{getText('pageForm.useAutoContentType')}"/>
 
                     <div id="manual-content-type-control-group" style="display:none">
                         <s:textfield name="bean.manualContentType"
-                                    label="%{getText('pageForm.useManualContentType')}" />
+                                     label="%{getText('pageForm.useManualContentType')}"/>
                     </div>
 
                 </div>
@@ -183,28 +181,25 @@
 
     var weblogURL = '<s:property value="actionWeblog.absoluteURL" />';
     var originalLink = '<s:property value="bean.link" />';
-    var type = '<s:property value="bean.type" /> ';
+    var type = '<s:property value="bean.type" />';
 
     $(document).ready(function () {
 
         $("#template-code-tabs").tabs();
 
         showContentTypeField();
-        $("#template_bean_autoContentType").change(function(e){
+        $("#template_bean_autoContentType").click(function(e) {
             showContentTypeField();
         });
-
-        $("#__checkbox_template_bean_autoContentType").change(function(e){
-            showContentTypeField();
-        });
-
-        // Update page URL when user changes link
-        function updatePageURLDisplay() {
-            var link = $("#template_bean_link").val();
-            if ( link !== "" ) {
-                $("#no_link").hide();
-                $("#good_link").show();
-                $("#linkPreview").html( link );
+    });
+
+    // Update page URL when user changes link
+    function updatePageURLDisplay() {
+        var link = $("#template_bean_link").val();
+        if (link !== "") {
+            $("#no_link").hide();
+            $("#good_link").show();
+            $("#linkPreview").html(link);
         } else {
             $("#good_link").hide();
             $("#no_link").show();
@@ -221,7 +216,8 @@
     }
 
     function showContentTypeField() {
-        if ( $("#template_bean_autoContentType").val() == "true" ) {
+        var checked = $("#template_bean_autoContentType").prop("checked");
+        if ( checked ) {
             $("#manual-content-type-control-group").hide();
         } else {
             $("#manual-content-type-control-group").show();

http://git-wip-us.apache.org/repos/asf/roller/blob/7fc12f4e/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp b/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp
index 7b06c3d..07ffa4d 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp
@@ -11,7 +11,6 @@ You can override it with your own file via WEB-INF/tiles-def.xml
 
 <script src="<s:url value='/webjars/jquery/3.3.1/jquery.min.js' />"></script>
 
-<link href="<s:url value='/webjars/jquery-ui/1.12.1/jquery-ui.theme.css' />" rel="stylesheet"
/>
 <script src="<s:url value='/webjars/jquery-ui/1.12.1/jquery-ui.min.js' />"></script>
 
 <link href="<s:url value='/webjars/bootstrap/3.3.7/css/bootstrap.min.css' />" rel="stylesheet"
/>

http://git-wip-us.apache.org/repos/asf/roller/blob/7fc12f4e/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp
index 8cebafa..9186684 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp
@@ -54,6 +54,7 @@
         </div>
 
         <c:if test="${sidebar != '/WEB-INF/jsps/tiles/empty.jsp'}">
+            <s:property value="sidebar" />
             <div class="panel panel-default">
                 <div class="panel-body">
                     <tiles:insertAttribute name="sidebar"/>


Mime
View raw message