fix message finding and add a top bar
This commit is contained in:
@@ -164,7 +164,9 @@ $(function(){
|
|||||||
$locale = Qstorage.getItem('locale') || 'en';
|
$locale = Qstorage.getItem('locale') || 'en';
|
||||||
if(Qstorage.getItem('message')){
|
if(Qstorage.getItem('message')){
|
||||||
var container = $('.alert-success');
|
var container = $('.alert-success');
|
||||||
container.find('div').text($translations[$locale]['messages'][Qstorage.getItem('message')]);
|
var msg_finder = Qstorage.getItem('message');
|
||||||
|
if(msg_finder.indexOf('.') == -1) msg_finder = 'messages.'+msg_finder;
|
||||||
|
container.find('div').text(t(msg_finder));
|
||||||
container.show();
|
container.show();
|
||||||
Qstorage.removeItem('message');
|
Qstorage.removeItem('message');
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,6 +16,8 @@ body
|
|||||||
margin-top: 4px
|
margin-top: 4px
|
||||||
margin-bottom: 6px
|
margin-bottom: 6px
|
||||||
padding-bottom: 0
|
padding-bottom: 0
|
||||||
|
.main-content
|
||||||
|
padding-top: 16px
|
||||||
.supplier-is-closed
|
.supplier-is-closed
|
||||||
.alert
|
.alert
|
||||||
form
|
form
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
@import "bootstrap"
|
@import "bootstrap"
|
||||||
body
|
body
|
||||||
padding-top: 60px
|
padding-top: 42px
|
||||||
@import "bootstrap-responsive"
|
@import "bootstrap-responsive"
|
||||||
|
|
||||||
// Set the correct sprite paths
|
// Set the correct sprite paths
|
||||||
|
|||||||
@@ -58,20 +58,18 @@ html lang="en"
|
|||||||
});
|
});
|
||||||
|
|
||||||
body class=action_name
|
body class=action_name
|
||||||
- unless ENV['QWAITER_MOBILE_EXPORT'] == 'yes'
|
.navbar.navbar-fixed-top
|
||||||
.navbar.navbar-fixed-top
|
.navbar-inner
|
||||||
.navbar-inner
|
.container
|
||||||
.container
|
a.btn.btn-navbar data-target=".nav-collapse" data-toggle="collapse"
|
||||||
a.btn.btn-navbar data-target=".nav-collapse" data-toggle="collapse"
|
span.icon-bar
|
||||||
span.icon-bar
|
span.icon-bar
|
||||||
span.icon-bar
|
span.icon-bar
|
||||||
span.icon-bar
|
= link_to image_tag('icons/logo-small.png', alt: application_title), user_root_path, class: :brand
|
||||||
= link_to image_tag('icons/logo-small.png', alt: application_title), user_root_path, class: :brand
|
.container.nav-collapse
|
||||||
.container.nav-collapse
|
ul.nav#top-navigation-list
|
||||||
ul.nav#top-navigation-list
|
li= link_to 'View history', user_list_history_path
|
||||||
li= link_to 'View history', user_list_history_path
|
|
||||||
.container
|
.container
|
||||||
|
|
||||||
.content
|
.content
|
||||||
.alert.alert-error.hide
|
.alert.alert-error.hide
|
||||||
button.close type="button" data-dismiss="alert" ×
|
button.close type="button" data-dismiss="alert" ×
|
||||||
|
|||||||
Reference in New Issue
Block a user