[cleanup] removed border for forms / pages etc (only desktop will now have background)
This commit is contained in:
Rushabh Mehta
parent
b1e1e0c659
commit
75ba09ee1b
12 changed files with 38 additions and 31 deletions
|
|
@ -1,6 +1,6 @@
|
|||
<div style="min-height: 500px; background: None; text-align: center;
|
||||
margin: 0px auto;">
|
||||
<div id="icon-grid">
|
||||
<div id="icon-grid" class="container">
|
||||
</div>
|
||||
</div>
|
||||
<div style="clear: both"></div>
|
||||
|
|
|
|||
|
|
@ -101,7 +101,5 @@ wn.core.pages.desktop.show_pending_notifications = function() {
|
|||
pscript.onload_desktop = function(wrapper) {
|
||||
// load desktop
|
||||
wn.core.pages.desktop.refresh();
|
||||
$(wrapper).css({"background-color": "transparent", "box-shadow":"none"});
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
body {
|
||||
margin: 0px;
|
||||
padding-top: 60px;
|
||||
padding-top: 50px;
|
||||
padding-bottom: 50px;
|
||||
}
|
||||
|
||||
|
|
@ -161,15 +161,13 @@ div#freeze {
|
|||
/* appframe header */
|
||||
|
||||
.appframe {
|
||||
background-color: #fff;
|
||||
border-radius: 5px;
|
||||
border: 3px solid #c7c7c7;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.appframe-header {
|
||||
margin-bottom: 20px;
|
||||
border-bottom: 1px solid #c7c7c7;
|
||||
border-bottom: 3px solid #c7c7c7;
|
||||
/*background-color: #f7f7f7;*/
|
||||
/*box-shadow: 0px 2px 4px rgba(0,0,0,0.2);*/
|
||||
}
|
||||
|
|
@ -239,6 +237,7 @@ div#freeze {
|
|||
margin-right: 4px;
|
||||
color: #888;
|
||||
cursor: pointer;
|
||||
font-size: 16px;
|
||||
}
|
||||
|
||||
.appframe .mini-bar i:hover {
|
||||
|
|
@ -254,6 +253,11 @@ div#freeze {
|
|||
color: orange;
|
||||
}
|
||||
|
||||
.appframe .mini-bar-1 {
|
||||
float: right;
|
||||
margin-top: 15px;
|
||||
}
|
||||
|
||||
.appframe .title-icon {
|
||||
cursor: pointer;
|
||||
display: inline-block;
|
||||
|
|
|
|||
|
|
@ -73,11 +73,8 @@ wn.Application = Class.extend({
|
|||
},
|
||||
|
||||
set_user_display_settings: function() {
|
||||
if(wn.boot.profile.background_image) {
|
||||
if(wn.boot.profile.background_image)
|
||||
wn.ui.set_user_background(wn.boot.profile.background_image);
|
||||
} else {
|
||||
$("body").css("background-color", "#F5EFE6")
|
||||
}
|
||||
},
|
||||
|
||||
load_bootinfo: function() {
|
||||
|
|
|
|||
|
|
@ -491,6 +491,7 @@ wn.ui.form.ControlButton = wn.ui.form.ControlData.extend({
|
|||
me.onclick();
|
||||
});
|
||||
this.input = this.$input.get(0);
|
||||
this.set_input_attributes();
|
||||
this.has_input = true;
|
||||
},
|
||||
onclick: function() {
|
||||
|
|
|
|||
|
|
@ -31,9 +31,15 @@ wn.avatar = function(user, large, title) {
|
|||
}
|
||||
|
||||
wn.ui.set_user_background = function(src) {
|
||||
wn.dom.set_style(repl('body { background: url("%(src)s") no-repeat center center fixed; \
|
||||
wn.dom.set_style(repl('#page-desktop { \
|
||||
position: fixed;\
|
||||
top: 0px; left: 0px; min-width: 100%; height: 100%; overflow: auto;\
|
||||
padding-top: 50px; \
|
||||
background: url("%(src)s") no-repeat center center fixed; \
|
||||
-webkit-background-size: cover; -moz-background-size: cover; \
|
||||
-o-background-size: cover; background-size: cover;}', {src:src}))
|
||||
-o-background-size: cover; \
|
||||
background-size: cover;\
|
||||
}', {src:src}))
|
||||
}
|
||||
|
||||
wn.provide('wn.user');
|
||||
|
|
|
|||
|
|
@ -9,18 +9,17 @@ wn.ui.AppFrame = Class.extend({
|
|||
this.buttons = {};
|
||||
this.fields_dict = {};
|
||||
|
||||
this.$w = $('<div class="appframe-header col-md-12">\
|
||||
this.$w = $('<div class="appframe-header">\
|
||||
<div class="row appframe-title">\
|
||||
<div class="col-md-12">\
|
||||
<div class="title-button-area btn-group pull-right" \
|
||||
style="margin-top: 10px;"></div>\
|
||||
<div class="mini-bar mini-bar-1"><ul></ul></div>\
|
||||
<div class="title-button-area-1 btn-group pull-right" \
|
||||
style="margin-top: 10px;"></div>\
|
||||
<div class="title-area"><h3 style="display: inline-block">\
|
||||
<span class="title-icon text-muted" style="display: none"></span>\
|
||||
<span class="title-text"></span></h3></div>\
|
||||
<div class="sub-title-area text-muted small"> </div>\
|
||||
<div class="mini-bar"><ul></ul></div>\
|
||||
<div class="mini-bar mini-bar-2"><ul></ul></div>\
|
||||
</div>\
|
||||
</div>\
|
||||
<div class="appframe-toolbar" style="display: none;"></div>\
|
||||
|
|
@ -56,7 +55,7 @@ wn.ui.AppFrame = Class.extend({
|
|||
},
|
||||
|
||||
add_to_mini_bar: function(icon, label, click) {
|
||||
var $ul = this.$w.find(".mini-bar ul"),
|
||||
var $ul = this.$w.find(".mini-bar-2 ul"),
|
||||
$li = $('<li><i class="'+icon+'"></i></li>')
|
||||
.attr("title", label)
|
||||
.appendTo($ul)
|
||||
|
|
@ -169,21 +168,22 @@ wn.ui.AppFrame = Class.extend({
|
|||
|
||||
set_views: function(views, active_view) {
|
||||
var me = this;
|
||||
$right = this.$w.find(".title-button-area");
|
||||
$right = this.$w.find(".mini-bar-1 ul");
|
||||
$.each(views, function(i, e) {
|
||||
var btn = $(repl('<button class="btn btn-default" data-route="%(route)s">\
|
||||
<i class="%(icon)s"></i></button>', e))
|
||||
var btn = $(repl('<li data-route="%(route)s">\
|
||||
<i class="%(icon)s"></i></li>', e))
|
||||
.click(e.set_route || function() {
|
||||
window.location.hash = "#" + $(this).attr("data-route");
|
||||
})
|
||||
.css({
|
||||
width: "39px"
|
||||
"color": "#c7c7c7",
|
||||
"text-decoration": "none"
|
||||
})
|
||||
.attr("title", wn._(toTitle(e.type)))
|
||||
.appendTo($right);
|
||||
|
||||
if(e.type===active_view) {
|
||||
btn.css({"color": "#428bca"});
|
||||
btn.find("i").css({"color": "#428bca"});
|
||||
}
|
||||
});
|
||||
},
|
||||
|
|
@ -332,13 +332,13 @@ wn.ui.make_app_page = function(opts) {
|
|||
]
|
||||
*/
|
||||
if(opts.single_column) {
|
||||
$('<div class="appframe col-md-12">\
|
||||
<div class="layout-appframe row"></div>\
|
||||
$('<div class="appframe">\
|
||||
<div class="layout-appframe"></div>\
|
||||
<div class="layout-main"></div>\
|
||||
</div>').appendTo(opts.parent);
|
||||
} else {
|
||||
$('<div class="appframe col-md-12">\
|
||||
<div class="layout-appframe row"></div>\
|
||||
$('<div class="appframe">\
|
||||
<div class="layout-appframe"></div>\
|
||||
<div class="row">\
|
||||
<div class="layout-main-section col-sm-9"></div>\
|
||||
<div class="layout-side-section col-sm-3"></div>\
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ wn.ui.FieldGroup = wn.ui.form.Layout.extend({
|
|||
if(f.df["default"]) f.set_input(f.df["default"]);
|
||||
})
|
||||
if(!this.no_submit_on_enter) {
|
||||
$(this.body).find(".control-input > .btn").filter(":first")
|
||||
$(this.body).find("[data-fieldtype='Button']").filter(":first")
|
||||
.removeClass("btn-default").addClass("btn-primary");
|
||||
this.catch_enter_as_submit();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -168,6 +168,7 @@ wn.views.CommunicationComposer = Class.extend({
|
|||
});
|
||||
|
||||
this.dialog.$wrapper.find("[data-edit='outdent']").remove();
|
||||
this.dialog.get_input("send").addClass("btn-primary");
|
||||
|
||||
$(document).on("upload_complete", function(event, filename, fileurl) {
|
||||
if(me.dialog.display) {
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ wn.views.Container = Class.extend({
|
|||
this.pagemargin = 50;
|
||||
},
|
||||
add_page: function(label, onshow, onhide) {
|
||||
var page = $('<div class="content row"></div>')
|
||||
var page = $('<div class="content"></div>')
|
||||
.attr('id', "page-" + label)
|
||||
.toggle(false)
|
||||
.appendTo(this.container).get(0);
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ wn.views.moduleview.ModuleView = Class.extend({
|
|||
.insertAfter(module_top);
|
||||
} else {
|
||||
var list_group = $('<ul class="list-group">\
|
||||
<li class="list-group-item" style="background-color: #eee">\
|
||||
<li class="list-group-item">\
|
||||
<h4 class="list-group-item-heading" style="margin-bottom: 0px;">\
|
||||
<i class="text-muted '+ section.icon+'"></i> '
|
||||
+ wn._(section.title) +'</h4>\
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ wn.show_not_permitted = function(page_name) {
|
|||
wn.show_message_page = function(page_name, title, message) {
|
||||
if(!page_name) page_name = wn.get_route_str();
|
||||
var page = wn.pages[page_name] || wn.container.add_page(page_name);
|
||||
$(page).html('<div class="appframe col-md-12">\
|
||||
$(page).html('<div class="appframe">\
|
||||
<div style="margin: 50px; text-align:center;">\
|
||||
<h3>'+title+'</h3><br>\
|
||||
<p>'+message+'</p><br>\
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue