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
4ee8217a
authored
Oct 24, 2017
by
Sebastián Collado Montañez
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
working on grids
parent
ad791c78
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
1 deletions
sails/src/assets/scripts/modules/student/controllers/collections.js
sails/src/assets/scripts/modules/student/views/collections.html
sails/src/assets/scripts/modules/student/controllers/collections.js
View file @
4ee8217a
...
...
@@ -581,6 +581,13 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
modalInstance
.
result
.
then
(
function
()
{});
};
$scope
.
child_grid
=
function
(
id_child_grid
){
if
(
id_child_grid
==
null
)
return
;
$scope
.
showGrid
(
id_child_grid
);
};
// Modal window to open picto config
$scope
.
open_config
=
function
(
studentPicto
)
{
console
.
log
(
studentPicto
);
...
...
sails/src/assets/scripts/modules/student/views/collections.html
View file @
4ee8217a
...
...
@@ -6,7 +6,7 @@
<div
class=
""
ng-switch=
"slide.state"
>
<!-- Slides -->
<div
class=
"col-xs-10"
>
<div
class=
"col-xs-10
switch-animation
"
>
<div
id=
"student_collection"
class=
"student-collection"
ng-class=
"{ 'student-collection-loading': loadingPictos }"
...
...
@@ -48,7 +48,9 @@
src=
"/app/img/redcross.png"
class=
"red-cross-visibility disabled"
ng-if=
"studentPicto.attributes.status == 'disabled'"
/>
<img
ng-click=
"child_grid(studentPicto.id_child_grid)"
ng-src=
"{{studentPicto.picto.uri}}"
class=
"unselectable"
ng-class=
"{
...
...
@@ -58,6 +60,7 @@
ng-style=
"{
'background-color': studentPicto.attributes.color || '#ffffff'
}"
/>
<div
class=
"picto_options"
ng-if=
"studentPicto == emptyStudentPicto"
>
...
...
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