Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
U
ulakbus-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ulakbus
ulakbus-ui
Commits
58260ab2
Commit
58260ab2
authored
Dec 23, 2015
by
Evren Kutar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
change expression of selected user and search user/student on dashboard
parent
4a771c72
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
5 deletions
+8
-5
dashboard.html
app/components/dashboard/dashboard.html
+1
-1
directives.js
app/shared/directives.js
+3
-0
sidebar.html
app/shared/templates/directives/sidebar.html
+1
-1
app.js
dist/app.js
+1
-1
templates.js
dist/templates.js
+2
-2
No files found.
app/components/dashboard/dashboard.html
View file @
58260ab2
...
...
@@ -44,7 +44,7 @@
<div
class=
"dashboard-main-search clearfix"
>
<div
class=
"row"
ng-show=
"$root.current_user.
is_staff
"
>
<div
class=
"row"
ng-show=
"$root.current_user.
can_search
"
>
<div
class=
"col-md-12"
>
<div
class=
"panel panel-default"
>
<div
class=
"panel-heading"
>
...
...
app/shared/directives.js
View file @
58260ab2
...
...
@@ -357,6 +357,9 @@ app.directive('logout', function ($http, $location, RESTURL) {
$rootScope
.
searchInputs
=
data
;
$rootScope
.
current_user
=
data
.
current_user
;
if
(
data
.
ogreci
||
data
.
personel
)
{
$rootScope
.
current_user
.
can_search
=
true
;
}
$rootScope
.
settings
=
data
.
settings
;
$scope
.
menuItems
=
$scope
.
prepareMenu
({
other
:
$scope
.
allMenuItems
.
other
});
...
...
app/shared/templates/directives/sidebar.html
View file @
58260ab2
...
...
@@ -2,7 +2,7 @@
<div
class=
"sidebar-container"
>
<!-- sidebar-person-info -->
<div
class=
"sidebar-person-info"
ng-show=
"$root.current_user.
is_staff
"
>
<div
class=
"sidebar-person-info"
ng-show=
"$root.current_user.
can_search
"
>
<!--<button class="btn btn-primary close-sidebar-person-info">Profili Kapat</button>-->
<div
class=
"identity"
>
<button
type=
"button"
class=
"close"
ng-class=
"{hidden: $root.collapsed || !selectedUser}"
...
...
dist/app.js
View file @
58260ab2
This diff is collapsed.
Click to expand it.
dist/templates.js
View file @
58260ab2
...
...
@@ -315,7 +315,7 @@ angular.module("components/dashboard/dashboard.html", []).run(["$templateCache",
"
\n
"
+
" <div class=
\"
dashboard-main-search clearfix
\"
>
\n
"
+
"
\n
"
+
" <div class=
\"
row
\"
ng-show=
\"
$root.current_user.
is_staff
\"
>
\n
"
+
" <div class=
\"
row
\"
ng-show=
\"
$root.current_user.
can_search
\"
>
\n
"
+
" <div class=
\"
col-md-12
\"
>
\n
"
+
" <div class=
\"
panel panel-default
\"
>
\n
"
+
" <div class=
\"
panel-heading
\"
>
\n
"
+
...
...
@@ -1296,7 +1296,7 @@ angular.module("shared/templates/directives/sidebar.html", []).run(["$templateCa
"
\n
"
+
" <div class=
\"
sidebar-container
\"
>
\n
"
+
" <!-- sidebar-person-info -->
\n
"
+
" <div class=
\"
sidebar-person-info
\"
ng-show=
\"
$root.current_user.
is_staff
\"
>
\n
"
+
" <div class=
\"
sidebar-person-info
\"
ng-show=
\"
$root.current_user.
can_search
\"
>
\n
"
+
" <!--<button class=
\"
btn btn-primary close-sidebar-person-info
\"
>Profili Kapat</button>-->
\n
"
+
" <div class=
\"
identity
\"
>
\n
"
+
" <button type=
\"
button
\"
class=
\"
close
\"
ng-class=
\"
{hidden: $root.collapsed || !selectedUser}
\"\n
"
+
...
...
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