Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
yotta
/
pictogram
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
60
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
2fde7804
authored
Apr 07, 2017
by
Jose Antonio
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Working on black and white interface
parent
1488a819
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
36 additions
and
1 deletions
sails/src/api/controllers/PictoController.js
sails/src/assets/scripts/modules/student/views/addpicto.html
sails/src/api/controllers/PictoController.js
View file @
2fde7804
...
@@ -352,7 +352,7 @@ module.exports = {
...
@@ -352,7 +352,7 @@ module.exports = {
var
l
=
[];
var
l
=
[];
var
fs
=
require
(
'fs'
);
var
fs
=
require
(
'fs'
);
Picto
.
find
({
source
:
3
})
Picto
.
find
({
source
:
req
.
params
.
source
})
.
paginate
({
page
:
req
.
params
.
page
,
limit
:
req
.
params
.
limit
})
.
paginate
({
page
:
req
.
params
.
page
,
limit
:
req
.
params
.
limit
})
.
populate
(
'expressions'
,
{
lang
:
req
.
params
.
lang
})
.
populate
(
'expressions'
,
{
lang
:
req
.
params
.
lang
})
.
then
(
function
(
pictos
)
{
.
then
(
function
(
pictos
)
{
...
...
sails/src/assets/scripts/modules/student/views/addpicto.html
View file @
2fde7804
...
@@ -46,6 +46,41 @@
...
@@ -46,6 +46,41 @@
</div>
</div>
</div>
</div>
<div
class=
"row"
>
<div
class=
"col-xs-6"
>
<div
class=
"btn-group btn-group-justified"
role=
"group"
>
<div
class=
"btn-group"
role=
"group"
>
<button
type=
"button"
btn-radio=
"'color'"
ng-model=
"color"
ng-click=
"update_color()"
class=
"btn btn-default"
>
{{'color' | translate}}
</button>
</div>
<div
class=
"btn-group"
role=
"group"
>
<button
type=
"button"
btn-radio=
"'byn'"
ng-model=
"color"
ng-click=
"update_color()"
class=
"btn btn-default"
>
{{'black_and_white' | translate}}
</button>
</div>
</div>
</div>
<!-- <div class="col-xs-4">
<div class="input-group">
<span class="input-group-addon">
<input type="radio" id="arasaac_color" ng-model="color" ng-value="3" ng-change="update_color()" class="ng-pristine ng-valid" value="3" >
</span>
<span class="form-control ng-binding" for="arasaac_color">
{{'color' | translate}}
</span>
</div>
</div>
<div class="col-xs-4">
<div class="input-group">
<span class="input-group-addon">
<input type="radio" id="arasaac_byn" ng-model="color" ng-value="4" ng-change="update_color()" class="ng-pristine ng-valid" value="4">
</span>
<span class="form-control ng-binding" for="arasaac_color">
{{'black_and_white' | translate}}
</span>
</div>
</div> -->
</div>
<hr>
<hr>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment