Skip to content

Commit

Permalink
Merge pull request #269 from peskk3am/issue_161_204
Browse files Browse the repository at this point in the history
New metadata form elements added (multiselect and input with cardinality...
  • Loading branch information
emanueldima committed Apr 19, 2014
2 parents a014dc2 + 271619b commit 7a97667
Show file tree
Hide file tree
Showing 10 changed files with 1,161 additions and 40 deletions.
2 changes: 2 additions & 0 deletions invenio/templates/page.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
{# Global CSS #}
{%- css 'css/bootstrap.css', '00-invenio' -%}
{%- css 'css/bootstrap-responsive.min.css', '00-invenio' -%}
{%- css 'css/bootstrap-multiselect.css', '00-invenio' -%}
{%- css 'css/token-input.css', '00-invenio' -%}
{%- css 'css/token-input-facebook.css', '00-invenio' -%}
{%- css 'css/b2s-common.css', '00-invenio' -%}
Expand All @@ -42,6 +43,7 @@
{# Global Javascript files #}
{%- js 'js/jquery.min.js', '00-invenio' -%}
{%- js 'js/bootstrap.js', '00-invenio' -%}
{%- js 'js/bootstrap-multiselect.js', '00-invenio' -%}
{%- js 'js/jquery.tokeninput.js', '00-invenio' -%}
{%- js 'js/invenio.js', '00-invenio' -%}

Expand Down
1 change: 1 addition & 0 deletions simplestore/etc/static/css/bootstrap-multiselect.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions simplestore/etc/static/css/simplestore-style.css
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@
}

#meta-fields {
overflow: visible;
text-align: left;
}

Expand Down Expand Up @@ -298,3 +299,30 @@ a.description:hover span {
border:10px solid #666;
background-color:#666; color:#fff
}

.plus, .minus {
width:30px;
height:30px;
overflow:hidden;
}

.plus {
background: url(/img/plus.png);
}

.minus {
background: url(/img/minus.png);
}

.add_field {
float:left;
width:240px;
}

.collapse.in {
overflow: visible;
}

.multiselect {
width:284px;
}
Binary file added simplestore/etc/static/img/minus.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added simplestore/etc/static/img/plus.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 7a97667

Please sign in to comment.