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

changed css-class from 'btn btn-close' to 'button-close' and added toggle for class 'activated' for toggle-buttons

This commit is contained in:
gschwab 2014-03-04 09:38:04 +01:00
parent 60bf913bfc
commit 2bacbb8d8b
12 changed files with 41 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/apps/system/aardvark/frontend/js/graphViewer/ui/graphViewerUI.js
View File

@ -225,11 +225,15 @@ function GraphViewerUI(container, adapterConfig, optWidth, optHeight, viewerConf
lists = makeConfigureDiv();
lists.filter = makeFilterDiv();
aConf.onclick = function () {
$('#filterdropdown').removeClass('activated');
$('#configuredropdown').toggleClass('activated');
$(lists.configure).slideToggle(200);
$(lists.filter).hide();
};
aFilter.onclick = function () {
$('#configuredropdown').removeClass('activated');
$('#filterdropdown').toggleClass('activated');
$(lists.filter).slideToggle(200);
$(lists.configure).hide();
};

4
js/apps/system/aardvark/frontend/js/graphViewer/ui/modalDialogHelper.js
View File

@ -414,7 +414,7 @@ var modalDialogHelper = modalDialogHelper || {};
footerDiv.className = "modal-footer";
buttonCancel.id = idprefix + "cancel";
buttonCancel.className = "btn btn-close btn-margin";
buttonCancel.className = "button-close btn-margin";
buttonCancel.appendChild(document.createTextNode("Close"));
buttonSubmit.id = idprefix + "submit";
@ -478,7 +478,7 @@ var modalDialogHelper = modalDialogHelper || {};
footerDiv.className = "modal-footer";
buttonCancel.id = idprefix + "cancel";
buttonCancel.className = "btn btn-close btn-margin";
buttonCancel.className = "button-close btn-margin";
buttonCancel.appendChild(document.createTextNode("Close"));
buttonSubmit.id = idprefix + "submit";

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

@ -219,7 +219,7 @@
</div>
</div>
<div id="colFooter" class="modal-footer">
<button id="closeBtnInfoView"class="btn btn-close" data-dismiss="modal" aria-hidden="true">Close</button>
<button id="closeBtnInfoView"class="button-close" data-dismiss="modal" aria-hidden="true">Close</button>
</div>
</div>
</script>

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

@ -78,7 +78,7 @@
<div id="colFooter" class="modal-footer">
<button id="delete-modified-collection" class="button-danger">Delete</button>
<button id="save-modified-collection" class="button-success" style="margin-right:8px">Save</button>
<button class="btn btn-close btn-margin" data-dismiss="modal" aria-hidden="true">Close</button>
<button class="button-close btn-margin" data-dismiss="modal" aria-hidden="true">Close</button>
</div>
<div class="alert alert-error" style="display:none" id="reallyDeleteColDiv">
<strong>Really delete Collection?</strong>

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

@ -46,7 +46,7 @@
</table>
</div>
<div class="modal-footer">
<button class="btn btn-close" data-dismiss="modal" aria-hidden="true">Close</button>
<button class="button-close" data-dismiss="modal" aria-hidden="true">Close</button>
<button id="submitCreateDatabase" class="button-success pull-right">Create</button>
</div>
</div>
@ -66,7 +66,7 @@
</table>
</div>
<div class="modal-footer">
<button class="btn btn-close" data-dismiss="modal" aria-hidden="true">Close</button>
<button class="button-close" data-dismiss="modal" aria-hidden="true">Close</button>
<button id="submitDeleteDatabase" class="button-danger pull-right">Delete</button>
</div>
</div>

6
js/apps/system/aardvark/frontend/js/templates/documentsView.ejs
View File

@ -233,7 +233,7 @@
<p>There is no way back…</p>
</div>
<div class="modal-footer">
<button class="btn btn-close" data-dismiss="modal" aria-hidden="true">Close</button>
<button class="button-close" data-dismiss="modal" aria-hidden="true">Close</button>
<button id="confirmDeleteBtn" class="button-danger" style="float:right" disabled="true">Delete</button>
</div>
</div>
@ -248,7 +248,7 @@
<p>There is no way back…</p>
</div>
<div class="modal-footer">
<button class="btn btn-close" data-dismiss="modal" aria-hidden="true">Close</button>
<button class="button-close" data-dismiss="modal" aria-hidden="true">Close</button>
<button id="confirmDeleteIndexBtn" class="button-danger" style="float:right">Delete</button>
</div>
</div>
@ -275,7 +275,7 @@
</table>
</div>
<div class="modal-footer">
<button class="btn btn-close" data-dismiss="modal" aria-hidden="true">Close</button>
<button class="button-close" data-dismiss="modal" aria-hidden="true">Close</button>
<button id="confirmCreateEdge" class="button-success" style="float:right">Create</button>
</div>
</div>

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

@ -61,7 +61,7 @@
</div>
<div class="modal-footer">
<button class="btn btn-close" data-dismiss="modal" aria-hidden="true">Close</button>
<button class="button-close" data-dismiss="modal" aria-hidden="true">Close</button>
<button id="save-new-collection" class="button-success pull-right">Save</button>
</div>
</div>

6
js/apps/system/aardvark/frontend/js/templates/userManagementView.ejs
View File

@ -141,7 +141,7 @@
</table>
</div>
<div class="modal-footer">
<button class="btn btn-close" data-dismiss="modal" aria-hidden="true">Close</button>
<button class="button-close" data-dismiss="modal" aria-hidden="true">Close</button>
<button id="submitCreateUser" class="button-success pull-right">Create</button>
</div>
</div>
@ -169,7 +169,7 @@
</table>
</div>
<div class="modal-footer">
<button class="btn btn-close" data-dismiss="modal" aria-hidden="true">Close</button>
<button class="button-close" data-dismiss="modal" aria-hidden="true">Close</button>
<button id="submitEditUser" class="button-success pull-right">Save</button>
<button id="deleteUser" class="button-danger pull-right">Delete</button>
</div>
@ -190,7 +190,7 @@
</table>
</div>
<div class="modal-footer">
<button class="btn btn-close" data-dismiss="modal" aria-hidden="true">Close</button>
<button class="button-close" data-dismiss="modal" aria-hidden="true">Close</button>
<button id="submitDeleteUser" class="button-danger pull-right">Delete</button>
</div>
</div>

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

@ -51,7 +51,7 @@
</table>
</div>
<div class="modal-footer">
<button class="btn btn-close" data-dismiss="modal" aria-hidden="true">Close</button>
<button class="button-close" data-dismiss="modal" aria-hidden="true">Close</button>
<button id="callEditUserPassword" class="button-danger pull-right">Change Password</button>
<button id="submitEditUserProfile" class="button-success pull-right">Save</button>
</div>
@ -81,7 +81,7 @@
</table>
</div>
<div class="modal-footer">
<button class="btn btn-close" data-dismiss="modal" aria-hidden="true">Close</button>
<button class="button-close" data-dismiss="modal" aria-hidden="true">Close</button>
<button id="submitEditUserPassword" class="button-success pull-right">Save</button>
</div>
</div>

20
js/apps/system/aardvark/frontend/js/views/applicationsView.js
View File

@ -7,14 +7,14 @@ window.ApplicationsView = Backbone.View.extend({
template: templateEngine.createTemplate("applicationsView.ejs"),
events: {
"click .toggle-icon": "toggleView",
"click #checkDevel": "toggleDevel",
"click #checkActive": "toggleActive",
"click #checkInactive": "toggleInactive",
"click #foxxToggle": "slideToggle",
"click #importFoxxToggle": "slideToggleImport",
"change #importFoxx": "uploadSetup",
"click #confirmFoxxImport": "importFoxx"
"click .toggle-icon" : "toggleView",
"click #checkDevel" : "toggleDevel",
"click #checkActive" : "toggleActive",
"click #checkInactive" : "toggleInactive",
"click #foxxToggle" : "slideToggle",
"click #importFoxxToggle" : "slideToggleImport",
"change #importFoxx" : "uploadSetup",
"click #confirmFoxxImport" : "importFoxx"
},
uploadSetup: function (e) {
@ -122,11 +122,15 @@ window.ApplicationsView = Backbone.View.extend({
},
slideToggleImport: function() {
$('#foxxToggle').removeClass('activated');
$('#importFoxxToggle').toggleClass('activated');
$('#foxxDropdownImport').slideToggle(200);
this.hideSettingsModal();
},
slideToggle: function() {
$('#importFoxxToggle').removeClass('activated');
$('#foxxToggle').toggleClass('activated');
$('#foxxDropdownOut').slideToggle(200);
this.hideImportModal();
},

9
js/apps/system/aardvark/frontend/js/views/documentsView.js
View File

@ -216,6 +216,9 @@
},
filterCollection : function () {
$('#indexCollection').removeClass('activated');
$('#importCollection').removeClass('activated');
$('#filterCollection').toggleClass('activated');
$('#filterHeader').slideToggle(200);
$('#importHeader').hide();
$('#indexHeader').hide();
@ -230,12 +233,18 @@
},
importCollection: function () {
$('#filterCollection').removeClass('activated');
$('#indexCollection').removeClass('activated');
$('#importCollection').toggleClass('activated');
$('#importHeader').slideToggle(200);
$('#filterHeader').hide();
$('#indexHeader').hide();
},
indexCollection: function () {
$('#filterCollection').removeClass('activated');
$('#importCollection').removeClass('activated');
$('#indexCollection').toggleClass('activated');
$('#newIndexView').hide();
$('#indexEditView').show();
$('#indexHeader').slideToggle(200);

2
js/apps/system/aardvark/frontend/js/views/queryView.js
View File

@ -473,7 +473,7 @@
$("#result").removeClass("active");
$("#tabContentQuery").show();
$("#tabContentResult").hide();
/* console.log("BLUBBBBBER2");
/*
this.resetState();
this.table = "logTableID";
this.clearTable();