diff --git a/core/page/desktop/desktop.html b/core/page/desktop/desktop.html index 43ee4236b7..35d5072f32 100644 --- a/core/page/desktop/desktop.html +++ b/core/page/desktop/desktop.html @@ -1,6 +1,6 @@
-
+
diff --git a/core/page/desktop/desktop.js b/core/page/desktop/desktop.js index 7038d89761..c8685c8b59 100644 --- a/core/page/desktop/desktop.js +++ b/core/page/desktop/desktop.js @@ -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"}); - } diff --git a/public/css/common.css b/public/css/common.css index 4524e03197..c04f94e28d 100644 --- a/public/css/common.css +++ b/public/css/common.css @@ -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; diff --git a/public/js/wn/app.js b/public/js/wn/app.js index 2283e9db32..a897b1676c 100644 --- a/public/js/wn/app.js +++ b/public/js/wn/app.js @@ -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() { diff --git a/public/js/wn/form/control.js b/public/js/wn/form/control.js index 02f8017d04..4bf249e0c8 100644 --- a/public/js/wn/form/control.js +++ b/public/js/wn/form/control.js @@ -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() { diff --git a/public/js/wn/misc/user.js b/public/js/wn/misc/user.js index 54920f6408..4eedf81fee 100644 --- a/public/js/wn/misc/user.js +++ b/public/js/wn/misc/user.js @@ -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'); diff --git a/public/js/wn/ui/appframe.js b/public/js/wn/ui/appframe.js index 5062091202..02be3be4e5 100644 --- a/public/js/wn/ui/appframe.js +++ b/public/js/wn/ui/appframe.js @@ -9,18 +9,17 @@ wn.ui.AppFrame = Class.extend({ this.buttons = {}; this.fields_dict = {}; - this.$w = $('
\ + this.$w = $('
\
\
\ -
\ +
    \
    \

    \ \

    \
     
    \ -
      \ +
        \
        \
        \ \ @@ -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 = $('
        • ') .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('', e)) + var btn = $(repl('
      • \ +
        • ', 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) { - $('
        \ -
        \ + $('
        \ +
        \
        \
        ').appendTo(opts.parent); } else { - $('
        \ -
        \ + $('
        \ +
        \
        \
        \
        \ diff --git a/public/js/wn/ui/field_group.js b/public/js/wn/ui/field_group.js index 84651075c8..3efe186159 100644 --- a/public/js/wn/ui/field_group.js +++ b/public/js/wn/ui/field_group.js @@ -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(); } diff --git a/public/js/wn/views/communication.js b/public/js/wn/views/communication.js index 40a0710f60..24e334c4c8 100644 --- a/public/js/wn/views/communication.js +++ b/public/js/wn/views/communication.js @@ -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) { diff --git a/public/js/wn/views/container.js b/public/js/wn/views/container.js index 619632f646..0beecdf65a 100644 --- a/public/js/wn/views/container.js +++ b/public/js/wn/views/container.js @@ -15,7 +15,7 @@ wn.views.Container = Class.extend({ this.pagemargin = 50; }, add_page: function(label, onshow, onhide) { - var page = $('
        ') + var page = $('
        ') .attr('id', "page-" + label) .toggle(false) .appendTo(this.container).get(0); diff --git a/public/js/wn/views/moduleview.js b/public/js/wn/views/moduleview.js index bad7b5a4ad..03572764f7 100644 --- a/public/js/wn/views/moduleview.js +++ b/public/js/wn/views/moduleview.js @@ -81,7 +81,7 @@ wn.views.moduleview.ModuleView = Class.extend({ .insertAfter(module_top); } else { var list_group = $('
          \ -
        • \ +
        • \

          \ ' + wn._(section.title) +'

          \ diff --git a/public/js/wn/views/pageview.js b/public/js/wn/views/pageview.js index 6d2d37470c..50dd896024 100644 --- a/public/js/wn/views/pageview.js +++ b/public/js/wn/views/pageview.js @@ -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('
          \ + $(page).html('
          \
          \

          '+title+'


          \

          '+message+'


          \