1
0
Fork 0
This commit is contained in:
Heiko Kernbach 2013-08-05 16:48:12 +02:00
parent 9b000d1fc4
commit 994471f236
4 changed files with 35 additions and 7 deletions

View File

@ -39,7 +39,7 @@ table.dataTable td {
margin-top: -65px !important;
}
#filterHeader {
#filterHeader, #importHeader {
margin-right: 0px;
margin-left: 0px;
margin-top: -10px;
@ -51,7 +51,15 @@ table.dataTable td {
top: 8px;
}
#filterHeader #sendFilter {
#importHeader input {
margin-bottom: 6px;
}
#confirmDocImport {
margin-right: 0px;
}
#filterHeader #sendFilter{
margin-right: 0px;
margin-left: 0px;
margin-top: -10px;
@ -382,13 +390,13 @@ table.dataTable thead th {
}
/*RADIUS*/
#documentsToolbarF a {
#documentsToolbarF a , #documentsToolbar a{
border-radius: 0 !important;
}
#documentsToolbarF ul {
#documentsToolbarF ul, #documentsToolbar ul {
border-radius: 0 !important;
}
#documentsToolbarF li {
#documentsToolbarF li ,#documentsToolbar li{
border-radius: 0 !important;
}
@ -400,3 +408,7 @@ table.dataTable thead th {
margin-top: -5px !important;
margin-left: 5px !important;
}
#documentsToolbar .glyphicon {
padding-top: 15px !important;
}

View File

@ -1,6 +1,6 @@
<div class="pull-right">
<span id="editCollection" class="ICON glyphicon glyphicon-edit" alt="Edit collection properties" title="Edit collection properties"></span>
<span id="editCollection" class="ICON glyphicon glyphicon-cog" alt="Edit collection properties" title="Edit collection properties"></span>
</div>
<div class="plain">

View File

@ -4,6 +4,7 @@
<!-- remove marker for docupdiv--!>
<ul><li class="enabled"><a id="filterCollection"><i class="icon icon-white icon-cog"></i></a></li></ul>
<ul><li class="enabled"><a id="importCollection"><span class="glyphicon glyphicon-paperclip"></span></a></li></ul>
<ul>
<li class="enabled"><a id="collectionPrev"><i class="icon icon-white icon-chevron-left"></i></a></li>
@ -25,12 +26,20 @@
<option value="&gt;=">&gt;=</option>
</select><input id="attribute_value0" type="text" placeholder="Attribute value" class="filterValue">
<a id="addFilterItem"><i class="icon-white icon-plus"></i></a>
<button id="importModal" class="btn btn-primary btn-success">Import</button>
<button id="resetView" class="btn btn-primary btn-success">Reset</button>
<button id="filterSend" class="btn btn-primary btn-success">Filter</button>
</div>
</div>
<div id="importHeader" style="display:none">
<div class="queryline">
<input id="importDocuments" name="importDocuments" type="file" accept="application/json" />
<button id="confirmDocImport" class="btn btn-success" style="float:right">
<img id="uploadIndicator" style="display: none;" src="/_admin/html/img/ajax-loader.gif"/>Import
</button>
</div>
</div>
<div id="documentsDiv">
<div id="uploadMessages"></div>
<table cellpadding="0" cellspacing="0" border="0" class="display" id="documentsTableID">

View File

@ -27,6 +27,7 @@ var documentsView = Backbone.View.extend({
"click #collectionPrev" : "prevCollection",
"click #collectionNext" : "nextCollection",
"click #filterCollection" : "filterCollection",
"click #importCollection" : "importCollection",
"click #filterSend" : "sendFilter",
"click #addFilterItem" : "addFilterItem",
"click .removeFilterItem" : "removeFilterItem",
@ -193,6 +194,7 @@ var documentsView = Backbone.View.extend({
filterCollection : function () {
$('#filterHeader').slideToggle("slow");
$('#importHeader').hide();
var i;
for (i in this.filters) {
@ -203,6 +205,11 @@ var documentsView = Backbone.View.extend({
}
},
importCollection: function () {
$('#importHeader').slideToggle("slow");
$('#filterHeader').hide();
},
sendFilter : function () {
var filters = [ ], bindValues = { };
var i;