Commit 22c7ccc4 authored by Evren Kutar's avatar Evren Kutar

Merge branch 'footerlocal'

parents caaa7767 0bc26c99
...@@ -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;
}
} }
......
...@@ -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
<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>-->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment