1
0
Fork 0

added new glyphicons

This commit is contained in:
Heiko Kernbach 2013-08-05 16:06:38 +02:00
parent 9734abf4bf
commit f88f371fd5
6 changed files with 20 additions and 9 deletions

2
html/admin/css/bootstrap-glyphicons.css vendored Executable file

File diff suppressed because one or more lines are too long

View File

@ -37,7 +37,7 @@
box-shadow: 0 0 0 !important;
}
.span3 .icon-edit, .span3 .icon-info-sign {
.span3 .ICON {
position: absolute;
margin-top: 3px;
margin-right: 5px;
@ -45,23 +45,24 @@
cursor: pointer;
}
.span3 .icon-edit {
.span3 .ICON{
right: 0px;
}
.span3 .icon-info-sign {
.span3 .spanInfo {
right: 20px;
}
.icon-edit:hover, .icon-info-sign:hover {
.span3 .ICON:hover {
opacity: 1.0;
}
.disabled-info-view {
.spanDisabled {
right: 20px !important;
opacity: 0.2 !important;
}
.disabled-info-view:hover {
.spanDisabled:hover {
opacity: 0.2 !important;
cursor: default !important;
}

View File

@ -12,6 +12,7 @@
<link href='css/swagger/hightlight.default.css' media='screen' rel='stylesheet' type='text/css'/>
<link href="css/bootstrap.css" rel="stylesheet">
<link href="css/bootstrap-glyphicons.css" rel="stylesheet">
<link href="css/jquery-ui-1.9.2.custom.css" rel="stylesheet">
<link href="css/layout.css" rel="stylesheet">
<link href="css/jquery.dataTables.css" rel="stylesheet">

View File

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

View File

@ -13,8 +13,8 @@ window.CollectionListItemView = Backbone.View.extend({
},
events: {
'click .pull-left' : 'noop',
'click .icon-edit' : 'editProperties',
'click .show-info-view' : 'showProperties',
'click #editCollection' : 'editProperties',
'click .spanInfo' : 'showProperties',
'click': 'selectCollection'
},
render: function () {

View File

@ -29,6 +29,7 @@ var collectionsView = Backbone.View.extend({
}, this);
//append info icon for loaded collections
/*
$('.loaded').parent().prev().append(
'<i class="icon-info-sign show-info-view" alt="Show collection properties"'+
'title="Show collection properties"></i>'
@ -36,6 +37,12 @@ var collectionsView = Backbone.View.extend({
$('.unloaded').parent().prev().append(
'<i class="icon-info-sign disabled-info-view" alt="disabled"'+
'title="disabled"></i>'
);*/
$('.loaded').parent().prev().append(
'<span class="glyphicon glyphicon-info-sign spanInfo ICON" alt="Show collection properties"</span>'
);
$('.unloaded').parent().prev().append(
'<span class="glyphicon glyphicon-info-sign spanDisabled ICON" alt="disabled"</span>'
);
$('#searchInput').val(searchOptions.searchPhrase);