From 5e577c6ea409dd81b4121a8966b53a146e669ee0 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 19 Sep 2016 13:16:00 +0530 Subject: [PATCH] [mobile][fixes] (frappe/frappe#2048) (frappe/erpnext#6386) (#2053) * [mobile][fix] uploaded images not visible * [mobile][fix] overflow title --- frappe/public/css/docs.css | 4 ++-- frappe/public/css/mobile.css | 6 ++++++ frappe/public/css/navbar.css | 4 ++-- frappe/public/css/page.css | 2 +- frappe/public/js/frappe/form/user_image.js | 3 +++ frappe/public/js/frappe/list/listview.js | 5 ++++- frappe/public/js/frappe/misc/common.js | 6 +++++- frappe/public/less/mobile.less | 7 +++++++ frappe/public/less/navbar.less | 4 ++-- frappe/public/less/page.less | 2 +- 10 files changed, 33 insertions(+), 10 deletions(-) diff --git a/frappe/public/css/docs.css b/frappe/public/css/docs.css index cd13c69198..bf04ecf9be 100644 --- a/frappe/public/css/docs.css +++ b/frappe/public/css/docs.css @@ -48,7 +48,7 @@ } @media (max-width: 767px) { .navbar-desk { - width: 40% !important; + width: 50% !important; } } #search-modal .modal-dialog, @@ -197,7 +197,7 @@ display: inline-block; } .toggle-sidebar { - margin-right: 15px; + margin-right: 10px; } .navbar-default .navbar-nav > li > a, .navbar-default .navbar-brand { diff --git a/frappe/public/css/mobile.css b/frappe/public/css/mobile.css index 556884f9ae..08a8e85c60 100644 --- a/frappe/public/css/mobile.css +++ b/frappe/public/css/mobile.css @@ -69,6 +69,11 @@ body { white-space: nowrap; overflow: hidden; } + #navbar-breadcrumbs li a { + width: 100px; + overflow: hidden; + text-overflow: ellipsis; + } #navbar-breadcrumbs > li, #navbar-breadcrumbs > li > a { display: inline-block; @@ -84,6 +89,7 @@ body { } .navbar-nav { margin: 0px; + margin-right: -15px; } .sidebar .form-group { margin-bottom: 0px; diff --git a/frappe/public/css/navbar.css b/frappe/public/css/navbar.css index 86e9af132c..6b7758a22a 100644 --- a/frappe/public/css/navbar.css +++ b/frappe/public/css/navbar.css @@ -48,7 +48,7 @@ } @media (max-width: 767px) { .navbar-desk { - width: 40% !important; + width: 50% !important; } } #search-modal .modal-dialog, @@ -197,7 +197,7 @@ display: inline-block; } .toggle-sidebar { - margin-right: 15px; + margin-right: 10px; } .navbar-default .navbar-nav > li > a, .navbar-default .navbar-brand { diff --git a/frappe/public/css/page.css b/frappe/public/css/page.css index c0557620ca..b671d2765f 100644 --- a/frappe/public/css/page.css +++ b/frappe/public/css/page.css @@ -47,7 +47,7 @@ width: 46px; height: 0; padding: 23px 0; - background-size: cover; + background-size: contain; background-repeat: no-repeat; background-position: center center; border-radius: 4px; diff --git a/frappe/public/js/frappe/form/user_image.js b/frappe/public/js/frappe/form/user_image.js index af96a4d62b..8be760179a 100644 --- a/frappe/public/js/frappe/form/user_image.js +++ b/frappe/public/js/frappe/form/user_image.js @@ -15,6 +15,9 @@ frappe.ui.form.set_user_image = function(frm) { // if image field has value if (image) { + image = (window.cordova && image.indexOf('http')===-1) ? + frappe.base_url + image : image; + image_section .find(".sidebar-image") .css("background-image", 'url("' + image + '")') diff --git a/frappe/public/js/frappe/list/listview.js b/frappe/public/js/frappe/list/listview.js index 89ff2bf31b..a1f44c6974 100644 --- a/frappe/public/js/frappe/list/listview.js +++ b/frappe/public/js/frappe/list/listview.js @@ -250,12 +250,15 @@ frappe.views.ListView = Class.extend({ "Datetime", "Float", "Int", "Link", "Percent", "Select", "Read Only", "Time" ]; + var image_url = (data.image && window.cordova && data.image.indexOf('http')===-1) ? + frappe.base_url + data.image : data.image; + img_col = $(frappe.render_template("image_view_item_row", { data: data, list: this, columns: this.columns, allowed_type: this.allowed_type, - item_image: data.image ? "url('" + data.image + "')" : null, + item_image: image_url ? "url('" + image_url + "')" : null, color: frappe.get_palette(data.item_name), subject: this.get_avatar_and_id(data, true), right_column: this.settings.right_column diff --git a/frappe/public/js/frappe/misc/common.js b/frappe/public/js/frappe/misc/common.js index 2d99189ce6..a3b95059fd 100644 --- a/frappe/public/js/frappe/misc/common.js +++ b/frappe/public/js/frappe/misc/common.js @@ -24,10 +24,14 @@ frappe.avatar = function(user, css_class, title) { } if(user_info.image) { + + var image = (window.cordova && user_info.image.indexOf('http')===-1) ? + frappe.base_url + user_info.image : user_info.image; + return repl('\ ', { - image: user_info.image, + image: image, title: title, abbr: user_info.abbr, css_class: css_class diff --git a/frappe/public/less/mobile.less b/frappe/public/less/mobile.less index 3a93b0c954..eb47ef77bb 100644 --- a/frappe/public/less/mobile.less +++ b/frappe/public/less/mobile.less @@ -92,6 +92,12 @@ body { max-width: 150px; white-space: nowrap; overflow: hidden; + + a { + width: 100px; + overflow: hidden; + text-overflow: ellipsis; + } } } @@ -112,6 +118,7 @@ body { .navbar-nav { margin: 0px; + margin-right: -15px; } .sidebar .form-group { diff --git a/frappe/public/less/navbar.less b/frappe/public/less/navbar.less index b925460889..20aa962893 100644 --- a/frappe/public/less/navbar.less +++ b/frappe/public/less/navbar.less @@ -59,7 +59,7 @@ @media (max-width: 767px) { .navbar-desk { - width: 40% !important; + width: 50% !important; } } @@ -225,7 +225,7 @@ } .toggle-sidebar { - margin-right: 15px; + margin-right: 10px; } .navbar-default .navbar-nav > li > a, diff --git a/frappe/public/less/page.less b/frappe/public/less/page.less index 4befeb99a2..32774dec5e 100644 --- a/frappe/public/less/page.less +++ b/frappe/public/less/page.less @@ -58,7 +58,7 @@ width: 46px; height: 0; padding: 23px 0; - background-size: cover; + background-size: contain; background-repeat: no-repeat; background-position: center center; border-radius: 4px;