Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed Selection box within the navigation bar and removed it from footer. Database tab is now functional

This commit is contained in:
Michael Hackstein 2013-11-07 15:36:59 +01:00
parent bf64d4bd2b
commit 638ba6c090
6 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/apps/system/aardvark/frontend/css/dbSelectionView.css
View File

@ -1,20 +1,12 @@
span.selectDB > select { span.selectDB {
width: 150px;
line-height: 20px;
height: 20px;
margin: -3px 0px 2px 0px;
border-radius: 0 !important;
border: 1px solid;
}
span.selectDB2 {
top: 6px; top: 6px;
left: 210px; left: 210px;
position: absolute; position: absolute;
} }
span.selectDB2 > select { span.selectDB > select {
line-height: 20px; line-height: 20px;
height: 20px; height: 20px;
width: 150px; width: 150px;
padding: 0px;
} }

4
js/apps/system/aardvark/frontend/js/templates/dbSelectionView.ejs
View File

@ -12,9 +12,5 @@ if (list.length > 1) {
%> %>
</select> </select>
<% <%
} else {
%>
<%=current%>
<%
} }
%> %>

2
js/apps/system/aardvark/frontend/js/templates/footerView.ejs
View File

@ -12,6 +12,6 @@
</div> </div>
<div class="footer-right"> <div class="footer-right">
<p <%=margin?"style='margin-right:"+margin+"px'":""%>><% if(n) { %>Server: <%=n%> <%=v%>, Database: <span id="selectDB" class="selectDB"></span><% } %></p> <p <%=margin?"style='margin-right:"+margin+"px'":""%>><% if(n) { %>Server: <%=n%> <%=v%>, Database: <%=db%><% } %></p>
</div> </div>
<div class="footer-invisible" id="databaseName"></div> <div class="footer-invisible" id="databaseName"></div>

2
js/apps/system/aardvark/frontend/js/templates/navigationView.ejs
View File

@ -3,7 +3,7 @@
<div class="container"> <div class="container">
<a class="arango-logo brand navlogo" href="#"><img src="img/logo_arangob_white.gif"/></a> <a class="arango-logo brand navlogo" href="#"><img src="img/logo_arangob_white.gif"/></a>
<span id="selectDB2" class="selectDB2"></span> <span id="selectDB" class="selectDB"></span>
<div class="nav-collapse arangoNavSwitch"> <div class="nav-collapse arangoNavSwitch">
<ul class="nav"> <ul class="nav">
</ul> </ul>

7
js/apps/system/aardvark/frontend/js/views/footerView.js
View File

@ -5,7 +5,6 @@ var footerView = Backbone.View.extend({
el: '.footer', el: '.footer',
system: {}, system: {},
isOffline: true, isOffline: true,
dbSelectionView: null,
initialize: function () { initialize: function () {
//also server online check //also server online check
@ -13,10 +12,6 @@ var footerView = Backbone.View.extend({
window.setInterval(function(){ window.setInterval(function(){
self.getVersion(); self.getVersion();
}, 15000); }, 15000);
this.dbSelectionView = new window.DBSelectionView({
collection: arangoDatabase
});
self.getVersion(); self.getVersion();
}, },
@ -89,7 +84,6 @@ var footerView = Backbone.View.extend({
database: this.system.database, database: this.system.database,
margin: this.resizeMargin margin: this.resizeMargin
})); }));
this.dbSelectionView.render($("#selectDB"));
/* /*
var tag = 'Server: ' + this.system.name + ' ' + this.system.version + var tag = 'Server: ' + this.system.name + ' ' + this.system.version +
', Database: ' + this.system.database; ', Database: ' + this.system.database;
@ -113,7 +107,6 @@ var footerView = Backbone.View.extend({
database: this.system.database, database: this.system.database,
margin: this.resizeMargin margin: this.resizeMargin
})); }));
this.dbSelectionView.render($("#selectDB"));
return this; return this;
} }

4
js/apps/system/aardvark/frontend/js/views/navigationView.js
View File

@ -15,13 +15,13 @@ var navigationView = Backbone.View.extend({
render: function() { render: function() {
$(this.el).html(this.template.render({})); $(this.el).html(this.template.render({}));
this.handleSelectNavigation(); this.handleSelectNavigation();
this.dbSelectionView.render($("#selectDB2")); this.dbSelectionView.render($("#selectDB"));
return this; return this;
}, },
handleResize: function (margin) { handleResize: function (margin) {
$('.arango-logo').css('margin-left', margin - 17); $('.arango-logo').css('margin-left', margin - 17);
$("#selectDB2").css('margin-left', margin - 17); $("#selectDB").css('margin-left', margin - 17);
$('.nav-collapse').css('margin-right', margin - 10); $('.nav-collapse').css('margin-right', margin - 10);
}, },