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
22c7ccc4
Commit
22c7ccc4
authored
Sep 30, 2015
by
Evren Kutar
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'footerlocal'
parents
caaa7767
0bc26c99
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
88 additions
and
15 deletions
+88
-15
app.css
app/app.css
+60
-0
app_routes.js
app/app_routes.js
+23
-14
header-sub-menu.html
app/shared/templates/directives/header-sub-menu.html
+5
-1
No files found.
app/app.css
View file @
22c7ccc4
...
@@ -49,6 +49,7 @@ a:hover {
...
@@ -49,6 +49,7 @@ a:hover {
background-color
:
transparent
;
background-color
:
transparent
;
padding
:
0
;
padding
:
0
;
font-size
:
18px
;
font-size
:
18px
;
float
:
left
;
}
}
/** BRAND **/
/** BRAND **/
...
@@ -85,6 +86,56 @@ button.brand-bg:hover {
...
@@ -85,6 +86,56 @@ button.brand-bg:hover {
/** END OF BRAND **/
/** END OF BRAND **/
/** LOADER **/
.loader
{
font-size
:
2px
;
position
:
relative
;
text-indent
:
-9999em
;
border-top
:
1.1em
solid
rgba
(
166
,
12
,
41
,
0.2
);
border-right
:
1.1em
solid
rgba
(
166
,
12
,
41
,
0.2
);
border-bottom
:
1.1em
solid
rgba
(
166
,
12
,
41
,
0.2
);
border-left
:
1.1em
solid
#A61229
;
-webkit-transform
:
translateZ
(
0
);
-ms-transform
:
translateZ
(
0
);
transform
:
translateZ
(
0
);
-webkit-animation
:
load8
1.1s
infinite
linear
;
animation
:
load8
1.1s
infinite
linear
;
float
:
left
;
margin-left
:
10px
;
margin-top
:
3px
;
}
.loader
,
.loader
:after
{
border-radius
:
50%
;
width
:
10em
;
height
:
10em
;
}
@-webkit-keyframes
load8
{
0
%
{
-webkit-transform
:
rotate
(
0deg
);
transform
:
rotate
(
0deg
);
}
100
%
{
-webkit-transform
:
rotate
(
360deg
);
transform
:
rotate
(
360deg
);
}
}
@keyframes
load8
{
0
%
{
-webkit-transform
:
rotate
(
0deg
);
transform
:
rotate
(
0deg
);
}
100
%
{
-webkit-transform
:
rotate
(
360deg
);
transform
:
rotate
(
360deg
);
}
}
/** END OF LOADER **/
/* Everything but the jumbotron gets side spacing for mobile first views */
/* Everything but the jumbotron gets side spacing for mobile first views */
.header
,
.header
,
.marketing
,
.marketing
,
...
@@ -1015,6 +1066,15 @@ table.dataTable thead .sorting:after {
...
@@ -1015,6 +1066,15 @@ table.dataTable thead .sorting:after {
body
{
body
{
overflow
:
auto
;
overflow
:
auto
;
}
}
.sidebar
footer
{
text-align
:
center
;
font-family
:
'robotomedium'
;
background-color
:
#F1F1F1
;
padding
:
15px
;
color
:
#A7A7A7
;
border-bottom
:
1px
solid
#ccc
;
}
}
}
...
...
app/app_routes.js
View file @
22c7ccc4
...
@@ -43,18 +43,27 @@ app.config(['$routeProvider', function ($routeProvider) {
...
@@ -43,18 +43,27 @@ app.config(['$routeProvider', function ($routeProvider) {
controller
:
'StaffShowCtrl'
controller
:
'StaffShowCtrl'
})
})
.
otherwise
({
redirectTo
:
'/dashboard'
});
.
otherwise
({
redirectTo
:
'/dashboard'
});
}]).
run
(
function
(
$rootScope
,
$location
,
$cookies
)
{
}])
.
run
(
function
(
$rootScope
)
{
$rootScope
.
loggedInUser
=
true
;
$rootScope
.
loggedInUser
=
true
;
$rootScope
.
$on
(
"$routeChangeStart"
,
function
(
event
,
next
,
current
)
{
$rootScope
.
$on
(
"$routeChangeStart"
,
function
(
event
,
next
,
current
)
{
// will be used when needed
// will be used when needed
});
});
}).
config
([
'$httpProvider'
,
function
(
$httpProvider
)
{
})
// to send cookies CORS
.
config
([
'$httpProvider'
,
function
(
$httpProvider
)
{
$httpProvider
.
defaults
.
withCredentials
=
true
;
// to send cookies CORS
}]).
run
(
function
(
gettextCatalog
)
{
$httpProvider
.
defaults
.
withCredentials
=
true
;
gettextCatalog
.
setCurrentLanguage
(
'tr'
);
}])
gettextCatalog
.
debug
=
true
;
.
run
(
function
(
gettextCatalog
)
{
}).
config
([
'cfpLoadingBarProvider'
,
function
(
cfpLoadingBarProvider
)
{
gettextCatalog
.
setCurrentLanguage
(
'tr'
);
cfpLoadingBarProvider
.
spinnerTemplate
=
'<div><span class="fa fa-spinner loadingbarfullsize"></div>'
;
gettextCatalog
.
debug
=
true
;
}]);
})
\ No newline at end of file
.
config
([
'cfpLoadingBarProvider'
,
function
(
cfpLoadingBarProvider
)
{
// no need bar on top of the page, set to false
cfpLoadingBarProvider
.
includeBar
=
false
;
// loaderdiv is a placeholder tag for loader in header-sub-menu.html
cfpLoadingBarProvider
.
parentSelector
=
"loaderdiv"
;
// loader template will be used when loader initialized
cfpLoadingBarProvider
.
spinnerTemplate
=
'<div class="loader">Loading...</div>'
;
}]);
\ No newline at end of file
app/shared/templates/directives/header-sub-menu.html
View file @
22c7ccc4
<div
class=
"manager-view-header container-fluid"
ng-class=
"{hidden: $root.loggedInUser != true}"
>
<div
class=
"manager-view-header container-fluid"
ng-class=
"{hidden: $root.loggedInUser != true}"
>
<header-breadcrumb></header-breadcrumb>
<div
class=
"clearfix"
>
<header-breadcrumb></header-breadcrumb>
<loaderdiv><div></div></loaderdiv>
<!--<div class="loader">Loading...</div>-->
</div>
<div
id=
"header-buttons"
ng-class=
"{hidden: $root.showSaveButton != true}"
>
<div
id=
"header-buttons"
ng-class=
"{hidden: $root.showSaveButton != true}"
>
<button
type=
"button"
class=
"btn btn-primary"
ng-click=
"triggerSubmit()"
>
Kaydet
</button>
<button
type=
"button"
class=
"btn btn-primary"
ng-click=
"triggerSubmit()"
>
Kaydet
</button>
<!--<button type="button" class="btn btn-warning">Düzenle</button>-->
<!--<button type="button" class="btn btn-warning">Düzenle</button>-->
...
...
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