roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [10/10] roller git commit: Converted weblog member and ping pages, also fixed Admin Menu regression
Date Sun, 21 Oct 2018 20:53:49 GMT
Converted weblog member and ping pages, also fixed Admin Menu regression


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

Branch: refs/heads/bootstrap-ui
Commit: 69763636d6b48617890b8771c5435002d9df5caf
Parents: 3564e13
Author: Dave Johnson <snoopdave@gmail.com>
Authored: Sun Oct 21 16:53:36 2018 -0400
Committer: Dave Johnson <snoopdave@gmail.com>
Committed: Sun Oct 21 16:53:36 2018 -0400

----------------------------------------------------------------------
 .../webapp/WEB-INF/jsps/admin/GlobalConfig.jsp  | 63 ++++++++++----------
 .../webapp/WEB-INF/jsps/editor/MemberResign.jsp | 24 +++-----
 .../main/webapp/WEB-INF/jsps/editor/Members.jsp |  6 +-
 .../WEB-INF/jsps/editor/MembersInvite.jsp       | 12 ++--
 .../WEB-INF/jsps/editor/MembersSidebar.jsp      | 57 ++++--------------
 .../main/webapp/WEB-INF/jsps/editor/Pings.jsp   | 15 ++---
 .../webapp/WEB-INF/jsps/tiles/bannerStatus.jsp  | 25 ++++++++
 app/src/main/webapp/WEB-INF/jsps/tiles/menu.jsp |  3 +-
 app/src/main/webapp/roller-ui/styles/roller.css |  5 ++
 9 files changed, 99 insertions(+), 111 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/roller/blob/69763636/app/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp b/app/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp
index 90d75d6..5487d27 100644
--- a/app/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp
@@ -34,13 +34,13 @@
             <%-- special case for comment plugins --%>
             <s:if test="#pd.name == 'users.comments.plugins'">
                 <s:checkboxlist label="%{getText(#pd.key)}" name="commentPlugins"
-                                list="pluginsList" listKey="id" value="name" listValue="name"
/>
+                                list="pluginsList" listKey="id" value="name" listValue="name"/>
             </s:if>
 
             <%-- special case for front page blog --%>
             <s:elseif test="#pd.name == 'site.frontpage.weblog.handle'">
                 <s:select name="%{#pd.name}" label="%{getText(#pd.key)}" value="%{properties[#pd.name].value}"
-                          list="weblogs" listKey="handle" listValueKey="name" />
+                          list="weblogs" listKey="handle" listValueKey="name"/>
             </s:elseif>
 
             <%-- "string" type means use a simple textbox --%>
@@ -60,11 +60,11 @@
 
                 <s:if test="properties[#pd.name].value == 'true'">
                     <s:checkbox name="%{#pd.name}" label="%{getText(#pd.key)}" cssClass="boolean"
-                        fieldValue="true" checked="true" onchange="formChanged()" />
+                                fieldValue="true" checked="true" onchange="formChanged()"/>
                 </s:if>
                 <s:if test="properties[#pd.name].value != 'true'">
                     <s:checkbox name="%{#pd.name}" label="%{getText(#pd.key)}" cssClass="boolean"
-                        fieldValue="false" onchange="formChanged()" />
+                                fieldValue="false" onchange="formChanged()"/>
                 </s:if>
 
             </s:elseif>
@@ -72,31 +72,32 @@
             <%-- "integer" use input type number --%>
             <s:elseif test="#pd.type == 'integer'">
                 <div class="form-group ">
-                    <label class="control-label"
-                        for='globalConfig_<s:property value="#pd.nameWithUnderbars" />'>
+                    <label class="col-sm-3 control-label"
+                           for='globalConfig_<s:property value="#pd.nameWithUnderbars"
/>'>
                         <s:text name="%{#pd.key}"/>
                     </label>
-                    <div class="controls">
+                    <div class="col-sm-9 controls">
                         <input type="number" name='<s:property value="#pd.name" />'
size="35"
-                                value='<s:property value="%{properties[#pd.name].value}"/>'
-                                id='globalConfig_<s:property value="#pd.nameWithUnderbars"
/>'
-                                class="form-control integer" onkeyup="formChanged()" />
+                               value='<s:property value="%{properties[#pd.name].value}"/>'
+                               id='globalConfig_<s:property value="#pd.nameWithUnderbars"
/>'
+                               class="form-control integer" onkeyup="formChanged()"/>
                     </div>
                 </div>
+
             </s:elseif>
 
             <%-- "float" use input type number --%>
             <s:elseif test="#pd.type == 'float'">
                 <div class="form-group ">
-                    <label class="control-label"
-                        for='globalConfig_<s:property value="#pd.nameWithUnderbars" />'>
+                    <label class="col-sm-3 control-label"
+                           for='globalConfig_<s:property value="#pd.nameWithUnderbars"
/>'>
                         <s:text name="%{#pd.key}"/>
                     </label>
-                    <div class="controls">
+                    <div class="col-sm-9 controls">
                         <input type="number" name='<s:property value="#pd.name" />'
size="5"
-                                value='<s:property value="properties[#pd.name].value"/>'
-                                id='globalConfig_<s:property value="#pd.nameWithUnderbars"
/>'
-                                class="form-control float" onkeyup="formChanged()" />
+                               value='<s:property value="properties[#pd.name].value"/>'
+                               id='globalConfig_<s:property value="#pd.nameWithUnderbars"
/>'
+                               class="form-control float" onkeyup="formChanged()"/>
                     </div>
                 </div>
             </s:elseif>
@@ -104,7 +105,7 @@
             <%-- if it's something we don't understand then use textbox --%>
             <s:else>
                 <s:textfield name="%{#pd.name}" label="%{getText(#pd.key)}" size="35"
-                             value="%{properties[#pd.name].value}" />
+                             value="%{properties[#pd.name].value}"/>
             </s:else>
 
         </s:iterator>
@@ -121,28 +122,28 @@
         var saveBookmarkButton = $('#saveButton:first');
         var error = false;
 
-        $("input").each( function() {
+        $("input").each(function () {
             var isInteger = $(this).hasClass("integer");
             var isFloat = $(this).hasClass("float");
             var isBoolean = $(this).hasClass("boolean");
 
-          if ( isInteger || isFloat )  {
+            if (isInteger || isFloat) {
 
-              if ( isNaN( this.valueAsNumber )) {
-                  $(this).css("background", "#FBB")
-                  error = true;
+                if (isNaN(this.valueAsNumber)) {
+                    $(this).css("background", "#FBB")
+                    error = true;
 
-              } else if ( isInteger && !Number.isInteger( this.valueAsNumber ) )
{
-                  $(this).css("background", "#FBB")
-                  error = true;
+                } else if (isInteger && !Number.isInteger(this.valueAsNumber)) {
+                    $(this).css("background", "#FBB")
+                    error = true;
 
-              } else {
-                  $(this).css("background", "white")
-              }
+                } else {
+                    $(this).css("background", "white")
+                }
 
-            } else if (isFloat)  {
+            } else if (isFloat) {
 
-                if ( isNaN( this.valueAsNumber )) {
+                if (isNaN(this.valueAsNumber)) {
                     $(this).css("background", "#FBB")
                     error = true;
 
@@ -157,7 +158,7 @@
 
         });
 
-        saveBookmarkButton.attr("disabled", error );
+        saveBookmarkButton.attr("disabled", error);
     }
 
 </script>

http://git-wip-us.apache.org/repos/asf/roller/blob/69763636/app/src/main/webapp/WEB-INF/jsps/editor/MemberResign.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/MemberResign.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/MemberResign.jsp
index 1e20b23..fca415e 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/MemberResign.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/MemberResign.jsp
@@ -18,20 +18,14 @@
 <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
 
 <p>
-   <s:text name="yourWebsites.confirmResignation">
-       <s:param value="weblog" />
-   </s:text>
+    <s:text name="yourWebsites.confirmResignation">
+        <s:param value="weblog"/>
+    </s:text>
 </p>
 
-<table>
-<tr>
-<td>
-    <s:form action="memberResign!resign">
-		<s:hidden name="salt" />
-        <s:hidden name="weblog" />
-        <s:submit value="%{getText('generic.yes')}" />&nbsp;
-        <s:submit value="%{getText('generic.no')}" action="menu"/>
-    </s:form>
-</td>
-</tr>
-</table>
+<s:form action="memberResign!resign"  cssClass="form-horizontal">
+    <s:hidden name="salt"/>
+    <s:hidden name="weblog"/>
+    <s:submit value="%{getText('generic.yes')}" cssClass="form-horizontal"/>&nbsp;
+    <s:submit value="%{getText('generic.no')}" action="menu" cssClass="form-horizontal"/>
+</s:form>

http://git-wip-us.apache.org/repos/asf/roller/blob/69763636/app/src/main/webapp/WEB-INF/jsps/editor/Members.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/Members.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/Members.jsp
index c444634..8eeaff7 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/Members.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/Members.jsp
@@ -41,7 +41,7 @@ function save() {
 
 <p><s:text name="memberPermissions.description" /></p>
 
-<s:form action="members!save">
+<s:form action="members!save" cssClass="form-horizontal">
 	<s:hidden name="salt" />
     <s:hidden name="weblog" value="%{actionWeblog.handle}" />
     
@@ -50,7 +50,7 @@ function save() {
             <s:text name="commentManagement.pending" />&nbsp;
     </div>
     
-    <table class="rollertable">
+    <table class="rollertable table table-striped">
         <tr class="rHeaderTr">
            <th class="rollertable" width="20%">
                <s:text name="memberPermissions.userName" />
@@ -108,7 +108,7 @@ function save() {
     <br />
      
     <div class="control">
-       <s:submit value="%{getText('generic.save')}" />
+       <s:submit value="%{getText('generic.save')}" cssClass="btn" />
     </div>
     
 </s:form>

http://git-wip-us.apache.org/repos/asf/roller/blob/69763636/app/src/main/webapp/WEB-INF/jsps/editor/MembersInvite.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/MembersInvite.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/MembersInvite.jsp
index 2ff4aac..9fbe57a 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/MembersInvite.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/MembersInvite.jsp
@@ -26,19 +26,19 @@
 <p class="subtitle"><s:text name="inviteMember.subtitle" /></p>
 <p><s:text name="inviteMember.prompt" /></p>
 
-<s:form action="invite!save">
+<s:form action="invite!save" cssClass="form-horizontal">
 	<s:hidden name="salt" />
     <s:hidden name="weblog" value="%{actionWeblog.handle}" />
     
     <div class="formrow">
-       <label for="userName" class="formrow" />
+       <label for="userName" class="formrow">
            <s:text name="inviteMember.userName" /></label>
        <div>
            <input name="userName" id="userName" size="30" maxlength="30" 
                onfocus="onUserNameFocus(true)" onkeyup="onUserNameChange(true)" /><br
/>
        </div>
-    </div>    
-    
+    </div>
+
     <div class="formrow">
        <label class="formrow" />&nbsp;</label>
        <div>
@@ -58,8 +58,8 @@
     </div>  
          
     <br />      
-    <s:submit value="%{getText('inviteMember.button.save')}" />
-    <s:submit value="%{getText('generic.cancel')}" action="invite!cancel" />
+    <s:submit value="%{getText('inviteMember.button.save')}"  cssClass="btn btn-default"/>
+    <s:submit value="%{getText('generic.cancel')}" action="invite!cancel" cssClass="btn"/>
 
 </s:form>
 

http://git-wip-us.apache.org/repos/asf/roller/blob/69763636/app/src/main/webapp/WEB-INF/jsps/editor/MembersSidebar.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/MembersSidebar.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/MembersSidebar.jsp
index 4e36873..77eef0a 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/MembersSidebar.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/MembersSidebar.jsp
@@ -17,50 +17,19 @@
 --%>
 <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
 
-<div class="sidebarFade">
-    <div class="menu-tr">
-        <div class="menu-tl">
-            
-        <div class="sidebarInner">
+<h3><s:text name="mainPage.actions" /></h3>
+<hr size="1" noshade="noshade" />
 
-            <h3><s:text name="mainPage.actions" /></h3>            
-            <hr size="1" noshade="noshade" />
-            
-            <img src='<s:url value="/images/email_edit.png"/>' alt="mail-icon" align="bottom"
/>
-            <s:url action="invite" var="inviteUrl">
-               <s:param name="weblog" value="%{actionWeblog.handle}" />
-            </s:url>
-            <a href='<s:property value="#inviteUrl" />'>
-                <s:text name="memberPermissions.inviteMember" />
-            </a>
-            <br />
-            <s:text name="memberPermissions.whyInvite" />       
-            <br />
-            <br />
-        </div>                					
-        </div>
-    </div>
-</div>	
+<img src='<s:url value="/images/email_edit.png"/>' alt="mail-icon" align="bottom"
/>
+<s:url action="invite" var="inviteUrl">
+   <s:param name="weblog" value="%{actionWeblog.handle}" />
+</s:url>
+<a href='<s:property value="#inviteUrl" />'>
+    <s:text name="memberPermissions.inviteMember" />
+</a>
+<s:text name="memberPermissions.whyInvite" />
 
-<br />
-<br />
+<h3> <s:text name="memberPermissions.permissionsHelpTitle" /> </h3>
+<hr size="1" noshade="noshade" />
 
-<div class="sidebarFade">
-    <div class="menu-tr">
-        <div class="menu-tl">
-            <div class="sidebarBody">
-            <div class="sidebarInner">
-            
-            <h3>
-                <s:text name="memberPermissions.permissionsHelpTitle" />
-            </h3>
-            <hr size="1" noshade="noshade" />
-            
-            <s:text name="memberPermissions.permissionHelp" />	
-		    <br />
-		    <br />
-        </div>		    
-            </div>
-        </div>
-    </div>
-</div>	
+<s:text name="memberPermissions.permissionHelp" />

http://git-wip-us.apache.org/repos/asf/roller/blob/69763636/app/src/main/webapp/WEB-INF/jsps/editor/Pings.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/Pings.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/Pings.jsp
index 0dd6994..fa90d6a 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/Pings.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/Pings.jsp
@@ -22,19 +22,14 @@
        <s:param value="actionWeblog.handle" />
    </s:text>
 </p>  
-<p class="pagetip">
-    <s:text name="pings.explanation"/>
-<p/>
+<p class="pagetip"> <s:text name="pings.explanation"/> </p>
 
-<p/>
-<h2><s:text name="pings.commonPingTargets"/></h2>
-<p/>
+<p> <h2><s:text name="pings.commonPingTargets"/></h2> </p>
 
-<p/>
-<s:text name="pings.commonPingTargetsExplanation"/>
-<p/>
+<p> <s:text name="pings.commonPingTargetsExplanation"/> </p>
 
-<table class="rollertable">
+
+<table class="rollertable table table-striped">
 <%-- Headings --%>
 <tr class="rollertable">
     <th class="rollertable" width="20%"><s:text name="generic.name" /></th>

http://git-wip-us.apache.org/repos/asf/roller/blob/69763636/app/src/main/webapp/WEB-INF/jsps/tiles/bannerStatus.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/bannerStatus.jsp b/app/src/main/webapp/WEB-INF/jsps/tiles/bannerStatus.jsp
index d5be278..f3b3c28 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/bannerStatus.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/bannerStatus.jsp
@@ -74,6 +74,31 @@ i
                     
                 </s:if>
 
+                <s:if test="actionWeblog == null">
+
+                    <s:set var="tabMenu" value="menu"/>
+                    <s:if test="#tabMenu != null">
+                        <s:iterator var="tab" value="#tabMenu.tabs">
+                            <li class="dropdown">
+                                <a href="#" class="dropdown-toggle" data-toggle="dropdown"
role="button"
+                                   aria-haspopup="true" aria-expanded="false">
+                                    <s:text name="%{#tab.key}"/> <span class="caret"></span>
+                                </a>
+                                <ul class="dropdown-menu">
+                                    <s:iterator var="tabItem" value="#tab.items" status="stat">
+                                        <li>
+                                            <a href="<s:url action='%{#tabItem.action}'
/>">
+                                                <s:text name="%{#tabItem.key}"/>
+                                            </a>
+                                        </li>
+                                    </s:iterator>
+                                </ul>
+                            </li>
+                        </s:iterator>
+                    </s:if>
+
+                </s:if>
+
             </ul>
             
             <ul class="nav navbar-nav navbar-right">

http://git-wip-us.apache.org/repos/asf/roller/blob/69763636/app/src/main/webapp/WEB-INF/jsps/tiles/menu.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/menu.jsp b/app/src/main/webapp/WEB-INF/jsps/tiles/menu.jsp
index 5579f8d..8055b63 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/menu.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/menu.jsp
@@ -20,8 +20,7 @@
 <s:set var="tabMenu" value="menu"/>
 <s:if test="#tabMenu != null">
 
-<<<<<<< HEAD
-    <%-- 
+    <%--
     <nav class="navbar navbar-default">
         <div class="container-fluid">
             <div id="navbar" class="navbar-collapse collapse">

http://git-wip-us.apache.org/repos/asf/roller/blob/69763636/app/src/main/webapp/roller-ui/styles/roller.css
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/roller-ui/styles/roller.css b/app/src/main/webapp/roller-ui/styles/roller.css
index 5aedcd1..8c8a5fd 100644
--- a/app/src/main/webapp/roller-ui/styles/roller.css
+++ b/app/src/main/webapp/roller-ui/styles/roller.css
@@ -307,3 +307,8 @@ div.image-controls input {
     height: 13em;
 }
 
+/* members */
+
+tr.rollertable_pending {
+    background: #ffffcc;
+}


Mime
View raw message