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
6113dffd
authored
Sep 05, 2017
by
Sebastián Collado Montañez
1
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
dashboard topbar improvement
parent
1649886a
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
9 deletions
sails/src/assets/scripts/modules/supervisor/controllers/supervisor.js
sails/src/assets/scripts/modules/supervisor/views/header.html
sails/src/assets/scripts/modules/supervisor/views/supervisor.html
sails/src/assets/styles/main.css
sails/src/assets/styles/topbar.less
sails/src/assets/scripts/modules/supervisor/controllers/supervisor.js
View file @
6113dffd
...
...
@@ -28,6 +28,10 @@ dashboardControllers.controller('SupervisorCtrl', function SupervisorCtrl(
$location
.
path
(
'/setup'
);
};
$scope
.
isActive
=
function
(
viewLocation
)
{
return
viewLocation
===
$location
.
path
();
};
// Subscribe to the supervisor's room
IOService
.
post
(
'/sup/subscribe'
,
{
action
:
'subscribe'
,
...
...
sails/src/assets/scripts/modules/supervisor/views/header.html
View file @
6113dffd
<nav
class=
"topbar navbar navbar-default"
role=
"navigation"
>
<div
class=
"container
-fluid
"
>
<div
class=
"container"
>
<div
class=
"navbar-header"
>
<a
class=
"topbar__logo navbar-brand"
...
...
@@ -15,17 +15,17 @@
</div>
<div
class=
"collapse navbar-collapse"
>
<ul
class=
"nav navbar-nav"
>
<li
ng-class=
"{active:
$location.url() == '/students'
}"
>
<li
ng-class=
"{active:
isActive('/students')
}"
>
<a
href=
"/app/#/students"
>
<i
class=
"fa fa-users"
aria-hidden=
"true"
></i>
{{ 'students' | translate }}
</a>
</li>
<li
ng-if=
"user.isOffice"
ng-class=
"{active:
$location.url() == '/supervisor/list'
}"
>
<li
ng-if=
"user.isOffice"
ng-class=
"{active:
isActive('/supervisor/list')
}"
>
<a
class=
"pointer"
role=
"menuitem"
tabindex=
"0"
href=
"/app/#/supervisor/list"
>
<i
class=
"fa fa-users"
aria-hidden=
"true"
></i>
{{ 'supervisors' | translate }}
</a>
</li>
<li
ng-if=
"!user.isTutor"
ng-class=
"{active:
$location.url() == '/instructions'
}"
>
<li
ng-if=
"!user.isTutor"
ng-class=
"{active:
isActive('/instructions')
}"
>
<a
href=
"/app/#/instructions"
>
<i
class=
"glyphicon glyphicon-tasks"
aria-hidden=
"true"
></i>
{{ 'instructions' | translate }}
</a>
...
...
sails/src/assets/scripts/modules/supervisor/views/supervisor.html
View file @
6113dffd
<!-- SupervisorCtrl controls here, see app.js -->
<header-supervisor></header-supervisor>
<div
class=
"container"
>
<header-supervisor></header-supervisor>
<!-- The content -->
<div
ui-view
id=
"main-content"
></div>
</div>
...
...
sails/src/assets/styles/main.css
View file @
6113dffd
...
...
@@ -1198,3 +1198,10 @@ input.editable.scene-name {
position
:
absolute
;
width
:
100%
}
.navbar-nav
{
margin-left
:
1em
;
}
.navbar-default
.navbar-nav
>
.active
>
a
{
border-radius
:
.4em
;
}
sails/src/assets/styles/topbar.less
View file @
6113dffd
...
...
@@ -3,10 +3,12 @@
* a supervisor has logged in.
*/
.topbar {
padding: 0.5em;
/*
padding: 0.5em;
border-top: none;
border-top-left-radius: 0;
border-top-right-radius: 0;
border-top-right-radius: 0;*/
padding: 0.7em;
border-radius: none;
&__logo {
width: 5rem;
...
...
Sebastián Collado Montañez
@scollado
mentioned in issue
#316 (closed)
Sep 05, 2017
mentioned in issue
#316 (closed)
mentioned in issue #316
Toggle commit list
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