Skip to content

yotta / pictogram

Go to a project
Commit c22555f1 by Arturo Montejo Ráez
Options

problem with buttons in addpicto solved

parent 17c926dd
Inline Side-by-side
Showing with 8 additions and 6 deletions
sails/src/assets/app/bower.json
......@@ -28,7 +28,8 @@
"ng-lodash": "~0.3.0",
"bootstrap-filestyle": "~1.2.1",
"ngMask": "angular-mask#~3.1.1",
"angular-recaptcha": "^4.0.1"
"angular-recaptcha": "^4.0.1",
"ui-bootstrap": "~2.5.0"
},
"resolutions": {
"angular": ">=1 <1.3.0",
......
sails/src/assets/index.html
......@@ -8,7 +8,6 @@
</script>
<title>Page Redirection</title>
</head>
<body>
<!-- Note: don't tell people to `click` the link, just tell them that it is a link. -->
If you are not redirected automatically, follow the <a href='/app'>link to example</a>
</body>
......
sails/src/assets/scripts/modules/student/views/addpicto.html
......@@ -2,13 +2,14 @@
<div class="modal-header">
<div class="btn-group">
<label class="btn btn-default" ng-model="source" uib-btn-radio="'symbolstx'" ng-click="open_category_from_bc('0')">
<button class="btn btn-default" btn-radio="'symbolstx'" ng-model="source" ng-click="open_category_from_bc('0')">
<span class="glyphicon glyphicon-th"></span> SymbolStix
</label>
<label class="btn btn-default" ng-model="source" uib-btn-radio="'ownpictos'" ng-click="load_own_pictos()">
</button>
<button class="btn btn-default" btn-radio="'ownpictos'" ng-model="source" ng-click="load_own_pictos()">
<span class="glyphicon glyphicon-picture"></span> {{ 'own_pictos' | translate }}
</label>
</button>
</div>
</div>
<div class="modal-body">
......
sails/src/tasks/config/concat.js
module.exports = function (grunt) {
/* eslint-disable max-len */
var jsLibs = [
// JQuery is added because ng-file-upload produces errors if not
'assets/app/bower_components/jquery/dist/jquery.min.js',
'assets/app/bower_components/angular/angular.min.js',
'assets/app/bower_components/angular-bootstrap/ui-bootstrap.min.js',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment