Cleanup of view so that it uses html helper functions
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/abaa8e93 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/abaa8e93 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/abaa8e93 Branch: refs/heads/Update-Sidebar-Ui Commit: abaa8e93120c2c75c808c2e7ed5437cbc7594bda Parents: 874a2a9 Author: suelockwood <[email protected]> Authored: Wed Apr 16 16:44:48 2014 -0400 Committer: suelockwood <[email protected]> Committed: Wed Apr 16 16:50:34 2014 -0400 ---------------------------------------------------------------------- .../app/addons/documents/templates/index_menu_item.html | 2 +- src/fauxton/app/addons/documents/views.js | 10 +++++----- src/fauxton/assets/less/fauxton.less | 9 ++++++--- 3 files changed, 12 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/abaa8e93/src/fauxton/app/addons/documents/templates/index_menu_item.html ---------------------------------------------------------------------- diff --git a/src/fauxton/app/addons/documents/templates/index_menu_item.html b/src/fauxton/app/addons/documents/templates/index_menu_item.html index 77b51d0..455f491 100644 --- a/src/fauxton/app/addons/documents/templates/index_menu_item.html +++ b/src/fauxton/app/addons/documents/templates/index_menu_item.html @@ -12,6 +12,6 @@ License for the specific language governing permissions and limitations under the License. --> -<a id="<%= ddoc_clean %>_<%= index_clean %>" href="#database/<%= database_encoded %>/_design/<%= ddoc_encoded %>/_<%=type%>/<%= index_encoded %>" class="toggle-view"> +<a id="<%= removeSpecialCharacters(ddoc) %>_<%= removeSpecialCharacters(index) %>" href="#database/<%= safeURL(database) %>/_design/<%= safeURL(ddoc)%>/_<%=type%>/<%= safeURL(index) %>" class="toggle-view"> <%= index %> </a> http://git-wip-us.apache.org/repos/asf/couchdb/blob/abaa8e93/src/fauxton/app/addons/documents/views.js ---------------------------------------------------------------------- diff --git a/src/fauxton/app/addons/documents/views.js b/src/fauxton/app/addons/documents/views.js index 1ee5a21..209faff 100644 --- a/src/fauxton/app/addons/documents/views.js +++ b/src/fauxton/app/addons/documents/views.js @@ -370,11 +370,11 @@ function(app, FauxtonAPI, Components, Documents, Databases, pouchdb, index: this.index, ddoc: this.ddoc, database: this.database, - index_clean: app.utils.removeSpecialCharacters(this.index), - ddoc_clean: app.utils.removeSpecialCharacters(this.ddoc), - index_encoded: app.utils.safeURLName(this.index), - ddoc_encoded: app.utils.safeURLName(this.ddoc), - database_encoded: app.utils.safeURLName(this.database), + // index_clean: app.utils.removeSpecialCharacters(this.index), + // ddoc_clean: app.utils.removeSpecialCharacters(this.ddoc), + // index_encoded: app.utils.safeURLName(this.index), + // ddoc_encoded: app.utils.safeURLName(this.ddoc), + // database_encoded: app.utils.safeURLName(this.database), selected: this.selected }; }, http://git-wip-us.apache.org/repos/asf/couchdb/blob/abaa8e93/src/fauxton/assets/less/fauxton.less ---------------------------------------------------------------------- diff --git a/src/fauxton/assets/less/fauxton.less b/src/fauxton/assets/less/fauxton.less index 559d8d2..268f7a6 100644 --- a/src/fauxton/assets/less/fauxton.less +++ b/src/fauxton/assets/less/fauxton.less @@ -388,7 +388,7 @@ table.databases { background: url(../img/couchdb-site.png) no-repeat 0 0; display: block; height: 100%; - width: 100%; + width: 100%; } .closeMenu & { .icon { @@ -410,7 +410,7 @@ table.databases { text-decoration: underline; } } - } + } } } nav { @@ -489,7 +489,7 @@ table.databases { color: @red; } } - + } ul#bottom-nav-links{ margin-top: 0; @@ -654,6 +654,9 @@ table.databases { display: block; .topmenu-defaults; background-color: #CBCBCB; + .closeMenu & { + left: @sidebarWidth+@collapsedNavWidth; + } } #dashboard-lower-content{
