roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject roller git commit: Better button layout.
Date Sat, 17 Jun 2017 15:49:07 GMT
Repository: roller
Updated Branches:
  refs/heads/bootstrap-ui 436aae82c -> a175b0dec


Better button layout.


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

Branch: refs/heads/bootstrap-ui
Commit: a175b0decdb283ccea2ff09d7759ee6a6986efad
Parents: 436aae8
Author: Dave Johnson <snoopdave@gmail.com>
Authored: Sat Jun 17 11:49:03 2017 -0400
Committer: Dave Johnson <snoopdave@gmail.com>
Committed: Sat Jun 17 11:49:03 2017 -0400

----------------------------------------------------------------------
 .../webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp   |  4 ++--
 .../main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp | 14 +++++++-------
 app/src/main/webapp/roller-ui/styles/roller.css       |  7 +++++--
 3 files changed, 14 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/roller/blob/a175b0de/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp
index fd9420a..89bc95d 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp
@@ -47,7 +47,7 @@
                     <div style="padding-left:2em; padding-top:1em">
                         <s:text name="mediaFileView.directoryName" />
                         <input type="text" id="newDirectoryName" name="newDirectoryName"
size="10" maxlength="25" />
-                        <input type="button" id="newDirectoryButton" class="btn"
+                        <input type="button" id="newDirectoryButton" class="btn btn-primary"
                             value='<s:text name="mediaFileView.create" />' onclick="onCreateDirectory()"
/>
                     </div>
                 </div>
@@ -114,7 +114,7 @@
 
                         <tr>
                             <td>
-                                <s:submit id="searchButton" cssClass="btn"
+                                <s:submit id="searchButton" cssClass="btn btn-primary"
                                     value="%{getText('mediaFileView.search')}" cssStyle="margin:5px
0px;"/>
                             </td>
                             <td>

http://git-wip-us.apache.org/repos/asf/roller/blob/a175b0de/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp
index c0c27af..d76a635 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp
@@ -66,7 +66,7 @@
             document.mediaFileViewForm.submit();
         }
     }
-    
+
     function onView() {
         document.mediaFileViewForm.action = "<s:url action='mediaFileView!view' />";
         document.mediaFileViewForm.submit();
@@ -201,19 +201,19 @@
     <s:hidden name="newDirectoryName" />
     <input type="hidden" name="mediaFileId" value="" />
 
-      <div class="top-controls">
+      <div class="image-controls">
+
           <s:if test="!allDirectories.isEmpty">
               <%-- Folder to View combo-box --%>
               <span><s:text name="mediaFileView.viewFolder"/>:</span>
               <s:select id="viewDirectoryMenu" name="viewDirectoryId"
                         list="allDirectories" listKey="id" listValue="name" onchange="onView()"/>
           </s:if>
-      </div>
 
-      <div class="top-controls">
           <span><s:text name="mediaFileView.sortBy"/>:</span>
           <s:select id="sortByMenu" name="sortBy" list="sortOptions" listKey="key" listValue="value"
                     onchange="document.mediaFileViewForm.submit();"/>
+
       </div>
 
 
@@ -354,16 +354,16 @@
 
       <s:if test="(!pager && childFiles.size() > 0) || (pager && pager.items.size()
> 0) || (currentDirectory.name != 'default' && !pager)">
 
-        <div class="bottom-controls">
+        <div class="image-controls">
 
             <s:if test="(!pager && childFiles.size() > 0) || (pager &&
pager.items.size() > 0)">
                 <input id="toggleButton" type="button" class="btn" style="display: inline"
                        value='<s:text name="generic.toggle" />' onclick="onToggle()"
/>
 
-                <input id="deleteButton" type="button"  class="btn" style="display: inline"
+                <input id="deleteButton" type="button"  class="btn btn-danger" style="display:
inline"
                        value='<s:text name="mediaFileView.deleteSelected" />' onclick="onDeleteSelected()"
/>
 
-                <input id="moveButton" type="button" class="btn" style="display: inline"
+                <input id="moveButton" type="button" class="btn btn-primary" style="display:
inline"
                        value='<s:text name="mediaFileView.moveSelected" />' onclick="onMoveSelected()"
/>
 
             </s:if>

http://git-wip-us.apache.org/repos/asf/roller/blob/a175b0de/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 f6bbb52..d94e016 100644
--- a/app/src/main/webapp/roller-ui/styles/roller.css
+++ b/app/src/main/webapp/roller-ui/styles/roller.css
@@ -285,7 +285,10 @@ span.button {
     margin: 1em 0 1em 0;
 }
 
-div.bottom-controls div,
-div.top-controls, div.top-controls div, div.top-controls span, div.top-controls select {
+div.image-controls,
+div.image-controls div,
+div.image-controls span,
+div.image-controls select,
+div.image-controls input {
     display: inline;
 }


Mime
View raw message