couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From deathb...@apache.org
Subject fauxton commit: updated refs/heads/secondary-indexes to 0fc34c0
Date Tue, 12 Aug 2014 18:14:23 GMT
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/secondary-indexes 0cf7101ed -> 0fc34c0ac


footer css updates and alert styling


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/0fc34c0a
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/0fc34c0a
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/0fc34c0a

Branch: refs/heads/secondary-indexes
Commit: 0fc34c0ac28dfb88b37cf20b24832ffd5e08da3f
Parents: 0cf7101
Author: deathbearbrown <deathbearbrown@gmail.com>
Authored: Tue Aug 12 14:14:27 2014 -0400
Committer: deathbearbrown <deathbearbrown@gmail.com>
Committed: Tue Aug 12 14:14:27 2014 -0400

----------------------------------------------------------------------
 app/addons/documents/assets/less/documents.less |  9 ---
 .../documents/templates/all_docs_list.html      |  4 +-
 .../documents/templates/all_docs_number.html    |  5 +-
 app/addons/documents/views.js                   |  6 +-
 app/addons/fauxton/components.js                |  1 +
 .../fauxton/templates/index_pagination.html     | 14 ++---
 assets/less/bootstrap/alerts.less               |  2 -
 assets/less/bootstrap/pagination.less           | 66 ++++++++++----------
 assets/less/bootstrap/variables.less            | 12 ++--
 assets/less/pagination.less                     | 32 +++++++++-
 10 files changed, 87 insertions(+), 64 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0fc34c0a/app/addons/documents/assets/less/documents.less
----------------------------------------------------------------------
diff --git a/app/addons/documents/assets/less/documents.less b/app/addons/documents/assets/less/documents.less
index 26e3ffa..33e7e98 100644
--- a/app/addons/documents/assets/less/documents.less
+++ b/app/addons/documents/assets/less/documents.less
@@ -33,15 +33,6 @@ button.beautify {
     }
 }
 
-#per-page {
-  float: right;
-
-  #select-per-page {
-    margin-top: 10px;
-  }
-
-}
-
 
 /** used in all_docs_list.html **/
 .view {

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0fc34c0a/app/addons/documents/templates/all_docs_list.html
----------------------------------------------------------------------
diff --git a/app/addons/documents/templates/all_docs_list.html b/app/addons/documents/templates/all_docs_list.html
index caa7cc5..bf7e250 100644
--- a/app/addons/documents/templates/all_docs_list.html
+++ b/app/addons/documents/templates/all_docs_list.html
@@ -25,6 +25,6 @@ the License.
   <% } %>
 </div>
 <footer class="pagination-footer window-resizeable">
-<div id="item-numbers"> </div>
-<div id="documents-pagination"></div>
+  <div id="item-numbers"> </div>
+  <div id="documents-pagination"></div>
 </footer>

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0fc34c0a/app/addons/documents/templates/all_docs_number.html
----------------------------------------------------------------------
diff --git a/app/addons/documents/templates/all_docs_number.html b/app/addons/documents/templates/all_docs_number.html
index 0461a4b..49d6898 100644
--- a/app/addons/documents/templates/all_docs_number.html
+++ b/app/addons/documents/templates/all_docs_number.html
@@ -12,9 +12,10 @@ License for the specific language governing permissions and limitations
under
 the License.
 -->
 <% if (totalRows === "unknown" || totalRows === 0){ %>
-Showing 0 documents. <a href="#/database/<%=database%>/new"> Create your first
document.</a>
+<p>Showing 0 documents.</p>
 <% } else { %>
-Showing <%=pageStart%> - <%= pageEnd %>
+
+<p>Showing <%=pageStart%> - <%= pageEnd %></p>
 <%}%>
 <% if (updateSeq) { %>
 -- Update Sequence: <%= updateSeq %>

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0fc34c0a/app/addons/documents/views.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/views.js b/app/addons/documents/views.js
index 9813b23..c954122 100644
--- a/app/addons/documents/views.js
+++ b/app/addons/documents/views.js
@@ -240,6 +240,7 @@ function(app, FauxtonAPI, Components, Documents, Databases, Views, QueryOptions,
         FauxtonAPI.addNotification({
           msg: 'The database <code>' + _.escape(databaseName) + '</code> has
been deleted.',
           clear: true,
+          type: "error",
           escape: false // beware of possible XSS when the message changes
         });
       }).fail(function (rsp, error, msg) {
@@ -318,10 +319,11 @@ function(app, FauxtonAPI, Components, Documents, Databases, Views, QueryOptions,
       if (!window.confirm("Are you sure you want to delete this doc?")) {
         return false;
       }
-
+      var storeID = _.clone(this.model);
       this.model.destroy().then(function(resp) {
         FauxtonAPI.addNotification({
-          msg: "Succesfully deleted your doc",
+          msg: "Doc "+storeID.get('id')+" has been deleted.",
+          type: "error",
           clear:  true
         });
         that.$el.fadeOut(function () {

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0fc34c0a/app/addons/fauxton/components.js
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/components.js b/app/addons/fauxton/components.js
index 55f4af4..d225cd9 100644
--- a/app/addons/fauxton/components.js
+++ b/app/addons/fauxton/components.js
@@ -178,6 +178,7 @@ function(app, FauxtonAPI, ace, spin, ZeroClipboard) {
 
   Components.IndexPagination = FauxtonAPI.View.extend({
     className: "pagination pagination-centered",
+    tagName: 'ul',
     template: "addons/fauxton/templates/index_pagination",
     events: {
       "click a": 'scrollTo',

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0fc34c0a/app/addons/fauxton/templates/index_pagination.html
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/templates/index_pagination.html b/app/addons/fauxton/templates/index_pagination.html
index 594f6fc..e3b030e 100644
--- a/app/addons/fauxton/templates/index_pagination.html
+++ b/app/addons/fauxton/templates/index_pagination.html
@@ -12,11 +12,11 @@ License for the specific language governing permissions and limitations
under
 the License.
 -->
 
-<ul>
-  <li <% if (!canShowPreviousfn()) {%> class="disabled" <% } %>>
-     <a id="previous" href="#"> Previous </a>
-   </li>
-   <li <% if (!canShowNextfn()) {%> class="disabled" <% } %>>
-     <a id="next" href="#"> Next </a></li>
-</ul>
+<li <% if (!canShowPreviousfn()) {%> class="disabled" <% } %>>
+ <a id="previous" class="icon fonticon-left-open" href="#"></a>
+</li>
+<li <% if (!canShowNextfn()) {%> class="disabled" <% } %>>
+ <a id="next" class="icon fonticon-right-open" href="#"></a>
+</li>
+
 

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0fc34c0a/assets/less/bootstrap/alerts.less
----------------------------------------------------------------------
diff --git a/assets/less/bootstrap/alerts.less b/assets/less/bootstrap/alerts.less
index c631078..281b88f 100644
--- a/assets/less/bootstrap/alerts.less
+++ b/assets/less/bootstrap/alerts.less
@@ -9,10 +9,8 @@
 .alert {
   padding: 8px 35px 8px 14px;
   min-height: 60px;
-  text-shadow: 0 1px 0 rgba(255,255,255,.5);
   background-color: @warningBackground;
   border: 1px solid @warningBorder;
-  .border-radius(@baseBorderRadius);
 }
 .alert,
 .alert h4 {

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0fc34c0a/assets/less/bootstrap/pagination.less
----------------------------------------------------------------------
diff --git a/assets/less/bootstrap/pagination.less b/assets/less/bootstrap/pagination.less
index a789db2..c1f6a26 100644
--- a/assets/less/bootstrap/pagination.less
+++ b/assets/less/bootstrap/pagination.less
@@ -7,22 +7,22 @@
   margin: @baseLineHeight 0;
 }
 
-.pagination ul {
+ul.pagination {
   // Allow for text-based alignment
   display: inline-block;
   .ie7-inline-block();
-  // Reset default ul styles
+  // Reset default styles
   margin-left: 0;
   margin-bottom: 0;
   // Visuals
   .border-radius(@baseBorderRadius);
   .box-shadow(0 1px 2px rgba(0,0,0,.05));
 }
-.pagination ul > li {
+ul.pagination > li {
   display: inline; // Remove list-style and block-level defaults
 }
-.pagination ul > li > a,
-.pagination ul > li > span {
+ul.pagination > li > a,
+ul.pagination > li > span {
   float: left; // Collapse white-space
   padding: 4px 12px;
   line-height: @baseLineHeight;
@@ -31,32 +31,32 @@
   border: 1px solid @paginationBorder;
   border-left-width: 0;
 }
-.pagination ul > li > a:hover,
-.pagination ul > li > a:focus,
-.pagination ul > .active > a,
-.pagination ul > .active > span {
+ul.pagination > li > a:hover,
+ul.pagination > li > a:focus,
+ul.pagination > .active > a,
+ul.pagination > .active > span {
   background-color: @paginationActiveBackground;
 }
-.pagination ul > .active > a,
-.pagination ul > .active > span {
+ul.pagination > .active > a,
+ul.pagination > .active > span {
   color: @grayLight;
   cursor: default;
 }
-.pagination ul > .disabled > span,
-.pagination ul > .disabled > a,
-.pagination ul > .disabled > a:hover,
-.pagination ul > .disabled > a:focus {
+ul.pagination > .disabled > span,
+ul.pagination > .disabled > a,
+ul.pagination > .disabled > a:hover,
+ul.pagination > .disabled > a:focus {
   color: @grayLight;
   background-color: transparent;
   cursor: default;
 }
-.pagination ul > li:first-child > a,
-.pagination ul > li:first-child > span {
+ul.pagination > li:first-child > a,
+ul.pagination > li:first-child > span {
   border-left-width: 1px;
   .border-left-radius(@baseBorderRadius);
 }
-.pagination ul > li:last-child > a,
-.pagination ul > li:last-child > span {
+ul.pagination > li:last-child > a,
+ul.pagination > li:last-child > span {
   .border-right-radius(@baseBorderRadius);
 }
 
@@ -77,17 +77,17 @@
 
 // Large
 .pagination-large {
-  ul > li > a,
-  ul > li > span {
+  > li > a,
+  > li > span {
     padding: @paddingLarge;
     font-size: @fontSizeLarge;
   }
-  ul > li:first-child > a,
-  ul > li:first-child > span {
+  > li:first-child > a,
+  > li:first-child > span {
     .border-left-radius(@borderRadiusLarge);
   }
-  ul > li:last-child > a,
-  ul > li:last-child > span {
+  > li:last-child > a,
+  > li:last-child > span {
     .border-right-radius(@borderRadiusLarge);
   }
 }
@@ -95,28 +95,28 @@
 // Small and mini
 .pagination-mini,
 .pagination-small {
-  ul > li:first-child > a,
-  ul > li:first-child > span {
+  > li:first-child > a,
+  > li:first-child > span {
     .border-left-radius(@borderRadiusSmall);
   }
-  ul > li:last-child > a,
-  ul > li:last-child > span {
+  > li:last-child > a,
+  > li:last-child > span {
     .border-right-radius(@borderRadiusSmall);
   }
 }
 
 // Small
 .pagination-small {
-  ul > li > a,
-  ul > li > span {
+  > li > a,
+  > li > span {
     padding: @paddingSmall;
     font-size: @fontSizeSmall;
   }
 }
 // Mini
 .pagination-mini {
-  ul > li > a,
-  ul > li > span {
+  > li > a,
+  > li > span {
     padding: @paddingMini;
     font-size: @fontSizeMini;
   }

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0fc34c0a/assets/less/bootstrap/variables.less
----------------------------------------------------------------------
diff --git a/assets/less/bootstrap/variables.less b/assets/less/bootstrap/variables.less
index f52b2cb..eee77a0 100644
--- a/assets/less/bootstrap/variables.less
+++ b/assets/less/bootstrap/variables.less
@@ -234,16 +234,16 @@
 @warningBackground:       #fcf8e3;
 @warningBorder:           darken(spin(@warningBackground, -10), 3%);
 
-@errorText:               #b94a48;
-@errorBackground:         #f2dede;
+@errorText:               #fff;
+@errorBackground:         #C55C56;
 @errorBorder:             darken(spin(@errorBackground, -10), 3%);
 
-@successText:             #468847;
-@successBackground:       #dff0d8;
+@successText:             #CBDFBD;
+@successBackground:       #448C11;
 @successBorder:           darken(spin(@successBackground, -10), 5%);
 
-@infoText:                #3a87ad;
-@infoBackground:          #d9edf7;
+@infoText:                #fff;
+@infoBackground:          #339999;
 @infoBorder:              darken(spin(@infoBackground, -10), 7%);
 
 

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0fc34c0a/assets/less/pagination.less
----------------------------------------------------------------------
diff --git a/assets/less/pagination.less b/assets/less/pagination.less
index 0137699..df0740a 100644
--- a/assets/less/pagination.less
+++ b/assets/less/pagination.less
@@ -14,8 +14,38 @@ footer.pagination-footer {
   position:fixed;
   background-color:#fff;
   bottom:0;
+  height: 50px;
   border-top:1px solid #ccc;
   .pagination{
-    margin: 15px 0 10px;
+    .box-shadow(none);
+    position: absolute;
+    right:0;
+    top: 0;
+    margin:0px;
+    height: 50px;
+    border-left: 1px solid #ccc;
+    li {
+      display: inline-block;
+      a {
+        padding: 15px 10px 15px 15px;
+        border: none;
+      }
+    }
+  }
+}
+
+#item-numbers{
+  p {
+    margin: 20px;
+    font-size: 14px;
+  }
+}
+
+div#per-page {
+  position: absolute;
+  right: 86px;
+  top: 2px;
+  #select-per-page {
+    margin-top: 10px;
   }
 }


Mime
View raw message