Pagination footer
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/45f082a1 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/45f082a1 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/45f082a1 Branch: refs/heads/secondary-indexes Commit: 45f082a1879909500ec6eac281daa19b88f5cbe9 Parents: f128847 Author: deathbearbrown <[email protected]> Authored: Sun Aug 24 16:33:43 2014 +0200 Committer: deathbearbrown <[email protected]> Committed: Mon Aug 25 09:37:36 2014 -0400 ---------------------------------------------------------------------- app/addons/documents/assets/less/documents.less | 9 --- .../documents/templates/all_docs_list.html | 6 +- .../documents/templates/all_docs_number.html | 5 +- app/addons/documents/views.js | 6 +- app/addons/fauxton/components.js | 1 + app/addons/fauxton/resizeColumns.js | 2 +- .../fauxton/templates/index_pagination.html | 14 ++--- app/addons/indexes/assets/less/doc-item.less | 2 +- app/templates/layouts/one_pane.html | 1 + app/templates/layouts/two_pane.html | 4 +- app/templates/layouts/with_sidebar.html | 1 + app/templates/layouts/with_tabs.html | 2 +- app/templates/layouts/with_tabs_sidebar.html | 2 +- assets/index.underscore | 1 - assets/less/bootstrap/alerts.less | 4 +- assets/less/bootstrap/pagination.less | 66 ++++++++++---------- assets/less/bootstrap/variables.less | 12 ++-- assets/less/headers.less | 28 +++++++-- assets/less/pagination.less | 32 +++++++++- assets/less/templates.less | 16 ++++- index.html | 2 +- 21 files changed, 136 insertions(+), 80 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/45f082a1/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/45f082a1/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 3eaca80..bf7e250 100644 --- a/app/addons/documents/templates/all_docs_list.html +++ b/app/addons/documents/templates/all_docs_list.html @@ -24,7 +24,7 @@ the License. </div> <% } %> </div> -<footer class="pagination-footer" class="window-resizeable"> -<div id="item-numbers"> </div> -<div id="documents-pagination"></div> +<footer class="pagination-footer window-resizeable"> + <div id="item-numbers"> </div> + <div id="documents-pagination"></div> </footer> http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/45f082a1/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/45f082a1/app/addons/documents/views.js ---------------------------------------------------------------------- diff --git a/app/addons/documents/views.js b/app/addons/documents/views.js index 3cfc229..694ee64 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/45f082a1/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/45f082a1/app/addons/fauxton/resizeColumns.js ---------------------------------------------------------------------- diff --git a/app/addons/fauxton/resizeColumns.js b/app/addons/fauxton/resizeColumns.js index 98555a9..3fd1883 100644 --- a/app/addons/fauxton/resizeColumns.js +++ b/app/addons/fauxton/resizeColumns.js @@ -99,7 +99,7 @@ function(FauxtonAPI) { setPosition: function(panelWidth){ var primary = this.getPrimaryNavWidth(); - $('#right-content').css('left',panelWidth+primary+4); + $('.set-left-position').css('left',panelWidth+primary+4); }, onResizeHandler: function (){ http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/45f082a1/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/45f082a1/app/addons/indexes/assets/less/doc-item.less ---------------------------------------------------------------------- diff --git a/app/addons/indexes/assets/less/doc-item.less b/app/addons/indexes/assets/less/doc-item.less index a04883a..ea92515 100644 --- a/app/addons/indexes/assets/less/doc-item.less +++ b/app/addons/indexes/assets/less/doc-item.less @@ -14,7 +14,7 @@ } #doc-list{ - margin-top: 30px; + padding-top: 30px; div.doc-row { margin-bottom:20px; div.select { http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/45f082a1/app/templates/layouts/one_pane.html ---------------------------------------------------------------------- diff --git a/app/templates/layouts/one_pane.html b/app/templates/layouts/one_pane.html index c7adf1f..0bbc989 100644 --- a/app/templates/layouts/one_pane.html +++ b/app/templates/layouts/one_pane.html @@ -14,6 +14,7 @@ the License. <div id="primary-navbar"></div> <div id="dashboard" class="container-fluid one-pane"> + <div id="global-notifications" class="container errors-container window-resizeable"></div> <div class="fixed-header"> <div id="breadcrumbs"></div> <div id="api-navbar"></div> http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/45f082a1/app/templates/layouts/two_pane.html ---------------------------------------------------------------------- diff --git a/app/templates/layouts/two_pane.html b/app/templates/layouts/two_pane.html index 0174a5a..053285a 100644 --- a/app/templates/layouts/two_pane.html +++ b/app/templates/layouts/two_pane.html @@ -14,7 +14,7 @@ the License. <div id="primary-navbar"></div> <div id="dashboard" class="container-fluid two-pane"> - + <div id="global-notifications" class="container errors-container window-resizeable set-left-position"></div> <header class="fixed-header row-fluid"> <div id="breadcrumbs" class="window-resizeable"></div> <div id="api-navbar" class="window-resizeable"></div> @@ -22,6 +22,6 @@ the License. <div class="content-area two-pane"> <div id="left-content" class="span6 window-resizeable"></div> - <div id="right-content" class="span6 window-resizeable"></div> + <div id="right-content" class="span6 window-resizeable set-left-position"></div> </div> </div> http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/45f082a1/app/templates/layouts/with_sidebar.html ---------------------------------------------------------------------- diff --git a/app/templates/layouts/with_sidebar.html b/app/templates/layouts/with_sidebar.html index 7fc64db..2d0f4fa 100644 --- a/app/templates/layouts/with_sidebar.html +++ b/app/templates/layouts/with_sidebar.html @@ -15,6 +15,7 @@ the License. <div id="primary-navbar"></div> <div id="dashboard" class="container-fluid with-sidebar"> + <div id="global-notifications" class="container errors-container window-resizeable"></div> <header class="fixed-header row-fluid"> <div id="breadcrumbs" class="sidebar"></div> <div id="api-navbar" class="window-resizeable"></div> http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/45f082a1/app/templates/layouts/with_tabs.html ---------------------------------------------------------------------- diff --git a/app/templates/layouts/with_tabs.html b/app/templates/layouts/with_tabs.html index 074385f..2d03d19 100644 --- a/app/templates/layouts/with_tabs.html +++ b/app/templates/layouts/with_tabs.html @@ -14,7 +14,7 @@ the License. <div id="primary-navbar"></div> <div id="dashboard" class="container-fluid"> - + <div id="global-notifications" class="container errors-container window-resizeable"></div> <header class="fixed-header row-fluid"> <div id="breadcrumbs" class="sidebar"></div> <div id="api-navbar" class="window-resizeable"></div> http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/45f082a1/app/templates/layouts/with_tabs_sidebar.html ---------------------------------------------------------------------- diff --git a/app/templates/layouts/with_tabs_sidebar.html b/app/templates/layouts/with_tabs_sidebar.html index de4bdee..0a7c661 100644 --- a/app/templates/layouts/with_tabs_sidebar.html +++ b/app/templates/layouts/with_tabs_sidebar.html @@ -14,7 +14,7 @@ the License. <div id="primary-navbar"></div> <div id="dashboard" class="container-fluid with-sidebar"> - + <div id="global-notifications" class="container errors-container window-resizeable"></div> <header class="fixed-header row-fluid"> <div id="breadcrumbs" class="sidebar"></div> <div id="api-navbar" class="window-resizeable"></div> http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/45f082a1/assets/index.underscore ---------------------------------------------------------------------- diff --git a/assets/index.underscore b/assets/index.underscore index 6a887b5..94befb9 100644 --- a/assets/index.underscore +++ b/assets/index.underscore @@ -33,7 +33,6 @@ <body id="home"> <!-- Main container. --> <div role="main" id="main"> - <div id="global-notifications" class="container errors-container"></div> <div id="app-container"></div> </div> http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/45f082a1/assets/less/bootstrap/alerts.less ---------------------------------------------------------------------- diff --git a/assets/less/bootstrap/alerts.less b/assets/less/bootstrap/alerts.less index 0116b19..281b88f 100644 --- a/assets/less/bootstrap/alerts.less +++ b/assets/less/bootstrap/alerts.less @@ -8,11 +8,9 @@ .alert { padding: 8px 35px 8px 14px; - margin-bottom: @baseLineHeight; - text-shadow: 0 1px 0 rgba(255,255,255,.5); + min-height: 60px; background-color: @warningBackground; border: 1px solid @warningBorder; - .border-radius(@baseBorderRadius); } .alert, .alert h4 { http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/45f082a1/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/45f082a1/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/45f082a1/assets/less/headers.less ---------------------------------------------------------------------- diff --git a/assets/less/headers.less b/assets/less/headers.less index 0323e3b..149e90b 100644 --- a/assets/less/headers.less +++ b/assets/less/headers.less @@ -10,6 +10,18 @@ * License for the specific language governing permissions and limitations under * the License. */ + +.left-shadow-border{ + border-left: 1px solid #999; + .box-shadow(-6px 0 rgba(0, 0, 0, 0.1)); +} + +.bottom-shadow-border{ + border-bottom: 1px solid #999; + .box-shadow(0px 6px 0 0 rgba(0, 0, 0, 0.1)); +} + + .fixed-header{ height: 60px; background-color: @breadcrumbBG; @@ -71,6 +83,11 @@ > div{ display:inline-block; } + .breadcrumb { + li:first-child{ + border-right: 1px solid #ccc; + } + } } .breadcrumb { margin-bottom: 0; @@ -86,7 +103,6 @@ .two-pane & { padding:20px 10px; font-size: 19px; - border-right: 1px solid #ccc; } } color: @breadcrumbText; @@ -109,16 +125,20 @@ position: absolute; right: 0; top: 0; + .dropdown-toggle { + color: #666666; + } a { + padding: 10px 20px; text-decoration: none; } .dropdown { border-left: 1px solid #ccc; - padding: 20px; + padding: 20px 0px; } .dropdown-menu { - left: -105px; - top: 56px; + left: -109px; + top: 48px; } } } http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/45f082a1/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; } } http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/45f082a1/assets/less/templates.less ---------------------------------------------------------------------- diff --git a/assets/less/templates.less b/assets/less/templates.less index 062cd32..3ab7d19 100644 --- a/assets/less/templates.less +++ b/assets/less/templates.less @@ -335,13 +335,17 @@ } } +#right-content, #dashboard-lower-content{ - background-color: #F1F1F1; .view { - padding: 20px; + background-color:#A8A1A1; } } +#dashboard-lower-content .view{ + padding: 20px; +} + #dashboard-upper-content{ .tab-content { padding-top: 70px; @@ -382,6 +386,14 @@ } } +#global-notifications{ + .with-sidebar & { + left: @sidebarWidth+@navWidth; + .closeMenu & { + left: @sidebarWidth+@collapsedNavWidth; + } + } +} /* Sidenav: USED IN DOCUMENT ADDON & EXTERNAL ADDONS http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/45f082a1/index.html ---------------------------------------------------------------------- diff --git a/index.html b/index.html index 892f499..844e9c9 100644 --- a/index.html +++ b/index.html @@ -36,7 +36,7 @@ <body id="home"> <!-- Main container. --> <div role="main" id="main"> - <div id="global-notifications" class="container errors-container"></div> + <div id="global-notifications" class="container errors-container window-resizeable"></div> <div id="app-container"></div> <hr>
