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
47ac1632
authored
Feb 14, 2017
by
Arturo Montejo Ráez
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
minor errors fixed
parent
d07588a1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
18 deletions
sails/src/assets/scripts/modules/student/controllers/addpicto.js
sails/src/assets/scripts/modules/student/views/addpicto.html
sails/src/assets/scripts/modules/student/controllers/addpicto.js
View file @
47ac1632
...
...
@@ -328,7 +328,11 @@ dashboardControllers.controller('AddPictoCtrl', function (
//
// Search srch_term_picto in owned or public pictos
//
$scope
.
search
=
function
(){
$scope
.
search
=
function
()
{
if
(
$scope
.
onlyOwn
)
return
;
$scope
.
page
=
1
;
// Reset pagination
var
length
=
$scope
.
srch_term_picto
==
undefined
?
0
:
$scope
.
srch_term_picto
.
length
;
if
(
length
<
2
){
//Check the word length
...
...
sails/src/assets/scripts/modules/student/views/addpicto.html
View file @
47ac1632
...
...
@@ -7,8 +7,7 @@
</button>
<h4
class=
"modal-title"
id=
"myModalLabel"
translate
ng-show=
"!onlyOwn"
>
add_picto
</h4>
<h4
class=
"modal-title"
id=
"myModalLabel"
translate
ng-show=
"onlyOwn"
>
own_pictos
</h4>
<hr>
<hr
ng-show=
"!onlyOwn"
>
<div
class=
"btn-group"
ng-show=
"!onlyOwn"
>
<button
class=
"btn btn-default"
btn-radio=
"'symbolstx'"
ng-model=
"source"
ng-click=
"open_category_from_bc('0')"
>
...
...
@@ -18,7 +17,6 @@
<span
class=
"glyphicon glyphicon-picture"
></span>
{{ 'own_pictos' | translate }}
</button>
</div>
</div>
<div
class=
"modal-body"
>
...
...
@@ -53,7 +51,7 @@
id=
"srch_term_picto"
name=
"srch_term_picto"
ng-model=
"srch_term_picto"
>
<span
class=
"input-group-btn"
>
<button
type=
"submit"
class=
"btn btn-primary"
>
<i
class=
"fa fa-search"
aria-hidden=
"true"
>
{{ 'search' | translate }}
</i>
<i
class=
"fa fa-search"
aria-hidden=
"true"
>
</i>
{{ 'search' | translate }}
</button>
</span>
</div>
...
...
@@ -61,7 +59,7 @@
<div
ng-show=
"source == 'ownpictos'"
class=
"input-group"
>
<button
class=
"btn btn-success"
ngf-select
ng-model=
"picFile"
accept=
"image/*"
ngf-change=
"addOwnPicto()"
>
<span
class=
"glyphicon glyphicon-folder-open"
></span>
{{ 'new_img' | translate }}
</
label
>
</
button
>
</div>
<!-- Galería de pictos -->
<div
id=
"clearfix-infiniteScroll-parent"
infinite-scroll=
"scroll()"
...
...
@@ -70,20 +68,16 @@
class=
"picto_peq pull-left"
ng-repeat=
"p in pictos"
>
<img
ng-src=
"{{p.uri}}"
popover=
"{{p.expressions[0].text}}"
popover-trigger=
"mouseenter"
/>
<
!-- Options to remove picto (Only for own pictos) --
>
<div
class=
"picto_options"
ng-show=
"source == 'ownpictos'"
>
<a
ng-click=
"remove_own_picto(p.id)"
class=
"picto_remove"
title=
"{{ 'delete' | translate}}"
>
<
div
class=
"picto_options"
>
<!-- Options to remove picto (Only for own pictos) --
>
<a
ng-click=
"remove_own_picto(p.id)"
class=
"picto_remove"
title=
"{{ 'delete' | translate}}"
ng-show=
"source == 'ownpictos'"
>
<span
class=
"color_red glyphicon glyphicon-remove-circle"
aria-hidden=
"true"
></span>
</a>
</div>
<div
class=
"picto_options"
>
<a
ng-click=
"remove_own_picto(p.id)"
class=
"picto_remove"
title=
"{{ 'delete' | translate}}"
>
<a
ng-click=
"close(p.id)"
class=
"picto_add"
title=
"{{ 'add_picto' | translate}}"
>
<i
class=
"color_green glyphicon glyphicon-plus-sign"
aria-hidden=
"true"
></i>
</a>
<a
ng-show=
"!onlyOwn"
ng-click=
"close(p.id)"
class=
"picto_add"
title=
"{{ 'add_picto' | translate}}"
>
<span
class=
"color_green glyphicon glyphicon-plus-sign"
aria-hidden=
"true"
></span>
</a>
</div>
</div>
...
...
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