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

first try with modals: some small bugs fixed

This commit is contained in:
gschwab 2014-04-03 10:53:04 +02:00
parent f9a5548e03
commit 98636cf1df
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@
aria-labelledby="myModalLabel" aria-hidden="true"> aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<a class="arangoHeader"><%=title%>></a> <a class="arangoHeader"><%=title%></a>
</div> </div>
<div class="modal-body"> <div class="modal-body">

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

@ -31,7 +31,7 @@
if (row.checked) { if (row.checked) {
checked = 'checked'; checked = 'checked';
} }
if (row.checked) { if (row.disabled) {
disabled = 'disabled'; disabled = 'disabled';
} }
%> %>

8
js/apps/system/aardvark/frontend/js/views/modalView.js
View File

@ -76,11 +76,15 @@
model = {}; model = {};
model.content = tableContent || []; model.content = tableContent || [];
$(".modal-body").html(template.render(model)); $(".modal-body").html(template.render(model));
$("#modal-dialog").show(); $('.modalTooltips').tooltip({
placement: "left"
});
$("#modal-dialog").modal("show");
}, },
hide: function() { hide: function() {
$("#modal-dialog").hide(); $("#modal-dialog").modal("hide");
} }
}); });
}()); }());

1
js/apps/system/aardvark/frontend/scss/_modals.scss
View File

@ -196,6 +196,5 @@ pre.gv-object-view {
} }
.createModalDialog table { .createModalDialog table {
display: none;
width: 100%; width: 100%;
} }

1
js/apps/system/aardvark/frontend/scss/generated.css
View File

@ -2595,7 +2595,6 @@ pre.gv-object-view {
margin-right: -18px; } margin-right: -18px; }
.createModalDialog table { .createModalDialog table {
display: none;
width: 100%; } width: 100%; }
.navlogo .stat_cpu { .navlogo .stat_cpu {