vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

dropdown in portal fixed

Browse source
This commit is contained in:
Faris Ansari 2016-07-01 16:12:17 +05:30
parent 27c82879a0
commit c05e139366
5 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frappe/public/css/docs.css
View file

@ -236,6 +236,10 @@ body {
}
.toggle-sidebar {
margin-right: 15px;
<<<<<<< HEAD
=======
border-color: #fff;
>>>>>>> 08ff129... added dropdown, disabled offcanvas in portal
}
.navbar-default .navbar-nav > li > a,
.navbar-default .navbar-brand {

2
frappe/templates/includes/list/list.js
View file

@ -38,7 +38,7 @@ frappe.ready(function() {
}
};
if($('.web-sidebar:visible').length === 0)
if($('.navbar-header .navbar-toggle:visible').length === 1)
{
$('.page-head h1').addClass('list-head').click(function(){
window.history.back();

12
frappe/templates/includes/navbar/navbar.html
View file

@ -4,12 +4,18 @@
<div class="navbar-header">
<!-- <a class="navbar-brand ellipsis" href="{{ url_prefix }}{{ home_page or "/" }}"> -->
<a class="navbar-brand ellipsis"
href="{{ url_prefix }}{% if frappe.user=="Guest" %} {{ home_page or "/"}} {% else %} /me {% endif %}">
href="{{ url_prefix }}{{ home_page or "/"}}">
<span>{{ brand_html or (frappe.get_hooks("brand_html") or ["Home"])[0] }}</span>
</a>
<a class="pull-right visible-xs navbar-toggle toggle-sidebar">
<!-- <a class="pull-right visible-xs navbar-toggle toggle-sidebar">
<i class="octicon octicon-three-bars"></i>
</a>
</a> -->
<div class="dropdown">
<button class="btn btn-default navbar-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<i class="octicon octicon-three-bars"></i>
</button>
{% include "templates/includes/navbar/dropdown_items.html" %}
</div>
</div>
<div class="hidden-xs">
{% block navbar_items %}

2
frappe/website/doctype/website_settings/website_settings.py
View file

@ -75,7 +75,7 @@ def get_website_settings():
'footer_items': get_items('footer_items'),
"post_login": [
{"label": "My Account", "url": "/me"},
{"class": "divider"},
# {"class": "divider"},
{"label": "Logout", "url": "/?cmd=web_logout"}
]
})

4
frappe/website/js/website.js
View file

@ -371,6 +371,7 @@ $(document).ready(function() {
window.logged_in = getCookie("sid") && getCookie("sid")!=="Guest";
$("#website-login").toggleClass("hide", logged_in ? true : false);
$("#website-post-login").toggleClass("hide", logged_in ? false : true);
$(".logged-in").toggleClass("hide", logged_in ? false : true);
frappe.bind_navbar_search();
@ -390,8 +391,9 @@ $(document).ready(function() {
});
// switch to app link
if(getCookie("system_user")==="yes") {
if(getCookie("system_user")==="yes" && logged_in) {
$("#website-post-login .dropdown-menu").append('<li><a href="/desk">Switch To Desk</a></li>');
$(".navbar-header .dropdown .dropdown-menu").append('<li><a href="/desk">Switch To Desk</a></li>');
}
frappe.render_user();