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
5a8d9b6d
authored
Apr 21, 2017
by
Sebastián Collado Montañez
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
scene change name, list correction
parent
64f9d759
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 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/styles/main.css
sails/src/assets/scripts/modules/student/controllers/collections.js
View file @
5a8d9b6d
...
...
@@ -311,6 +311,8 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
ngToast
.
success
({
content
:
translation
});
});
location
.
reload
();
}).
error
(
function
()
{});
};
...
...
sails/src/assets/scripts/modules/student/views/collections.html
View file @
5a8d9b6d
...
...
@@ -321,7 +321,7 @@
<div
class=
"col-xs-2"
>
<div
class=
"text-center"
>
<
h4>
{{ viewingScene.name }}
<h4
>
<
input
type=
"text"
class=
"editable scene-name text-center"
ng-model=
"viewingScene.name"
>
<a
style=
"text-decoration:none"
popover=
"Escena ya activada"
popover-trigger=
"mouseenter"
ng-if=
"viewingScene.active"
><span
class=
"label label-success"
><i
class=
"fa fa-star"
aria-hidden=
"true"
></i>
Escena activa
</span></a>
<a
style=
"text-decoration:none"
popover=
"Activar escena"
popover-trigger=
"mouseenter"
ng-if=
"!viewingScene.active"
ng-click=
"viewingScene.active=true;update_scene(viewingScene)"
><span
class=
"label label-default"
><i
class=
"fa fa-star-o"
aria-hidden=
"true"
></i>
Escena inactiva
</span></a>
</div>
...
...
sails/src/assets/styles/main.css
View file @
5a8d9b6d
...
...
@@ -1057,3 +1057,12 @@ form .progress {
display
:
none
;
}
}
/* Estilos para las escenas */
input
.editable.scene-name
{
min-width
:
inherit
;
width
:
100%
;
font-size
:
16px
;
font-weight
:
600
;
}
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