From bdc1d426b806f5d64ef68b71cc480d727c71aca2 Mon Sep 17 00:00:00 2001 From: tristen Date: Wed, 5 Jun 2013 13:26:21 -0400 Subject: [PATCH] Save link now prompts a sidebar --- app.css | 80 ++++++-------- ...rose-129b77953cd92a716f7e5224f4de015e.eot} | Bin 6124 -> 6120 bytes ...rose-129b77953cd92a716f7e5224f4de015e.woff | Bin 0 -> 3784 bytes ...rose-80081ddd6bb627b0784ec9094fabb857.woff | Bin 3784 -> 0 bytes src/prose/models.js | 2 +- src/prose/views/app.js | 104 +++++++++++------- src/prose/views/post.js | 10 +- templates/app.html | 2 +- templates/settings.html | 14 +-- templates/sidebarSave.html | 12 ++ 10 files changed, 113 insertions(+), 111 deletions(-) rename fonts/{prose-80081ddd6bb627b0784ec9094fabb857.eot => prose-129b77953cd92a716f7e5224f4de015e.eot} (73%) create mode 100644 fonts/prose-129b77953cd92a716f7e5224f4de015e.woff delete mode 100644 fonts/prose-80081ddd6bb627b0784ec9094fabb857.woff create mode 100644 templates/sidebarSave.html diff --git a/app.css b/app.css index 4b0853c1b..9a0d428d8 100644 --- a/app.css +++ b/app.css @@ -80,9 +80,9 @@ table { border-collapse: collapse; border-spacing:0; } @font-face { font-family:'Prose'; - src:url('fonts/prose-80081ddd6bb627b0784ec9094fabb857.eot'); - src:url('fonts/prose-80081ddd6bb627b0784ec9094fabb857.eot?#iefix') format('embedded-opentype'), - url('fonts/prose-80081ddd6bb627b0784ec9094fabb857.woff') format('woff'); + src:url('fonts/prose-129b77953cd92a716f7e5224f4de015e.eot'); + src:url('fonts/prose-129b77953cd92a716f7e5224f4de015e.eot?#iefix') format('embedded-opentype'), + url('fonts/prose-129b77953cd92a716f7e5224f4de015e.woff') format('woff'); font-weight:700; font-style:normal; } @@ -285,22 +285,22 @@ textarea#code { border-width:1px; } -::-webkit-input-placeholder { color:#d4d7d9; } -::-moz-placeholder { color:#d4d7d9; } -:-ms-input-placeholder { color:#d4d7d9; } -input:-moz-placeholder { color:#d4d7d9; } +::-webkit-input-placeholder { color:#a8afb2; } +::-moz-placeholder { color:#a8afb2; } +:-ms-input-placeholder { color:#a8afb2; } +input:-moz-placeholder { color:#a8afb2; } -.filepath::-webkit-input-placeholder { font-style:italic; } -.filepath::-moz-placeholder { font-style:italic; } -.filepath:-ms-input-placeholder { font-style:italic; } -.filepath:-moz-placeholder { font-style:italic; } +.filepath::-webkit-input-placeholder { color:#d4d7d9; font-style:italic; } +.filepath::-moz-placeholder { color:#d4d7d9; font-style:italic; } +.filepath:-ms-input-placeholder { color:#d4d7d9; font-style:italic; } +.filepath:-moz-placeholder { color:#d4d7d9; font-style:italic; } strong { font-weight:700; } em { font-style:italic; } /* For Diff Viewing */ del { - color:#d4d7d9; + color:#516066; padding:1px 0; } ins { @@ -483,7 +483,7 @@ ins { width:60px; height:30px; bottom:0; - right:0; + right:-30px; } .heading .filepath:focus, .heading .filepath:hover { @@ -557,6 +557,7 @@ ins { left:0; width:100%; padding:15px; + color:#3d494e; } .loading .loading-icon { background:transparent url('img/loader@33x33.gif') no-repeat; @@ -585,9 +586,10 @@ ins { z-index:5000; width:60px; height:100%; + border-left:1px solid #fff; } .open .vert { - border-left:1px solid #d4d7d9; + border-color:#d4d7d9; } .vert ul { @@ -690,18 +692,12 @@ ins { .published .ico.checkmark, .ico.checkmark, .ico.added { color:#90bb74; } - -.vert .ico.logout { color:#db6f6f; } - .ico.modified { color:#2099aa; } .ico.removed { color:#d35252; } - .ico.error { color:#db6f6f; } .ico.renamed { color:#bb9f1a; } .ico.private { color:#deb400; } -.vert .ico.logout:hover { background-color:#db6f6f; color:#fff; } - .ico { font-family:'Prose'; font-size:22px; @@ -735,12 +731,12 @@ ins { .ico.picture:before { content: "\f116"; } .ico.private:before { content: "\f117"; } .ico.question:before { content: "\f118"; } -.ico.quick-save:before { content: "\f119"; } -.ico.quote:before { content: "\f11a"; } -.ico.removed:before { content: "\f11b"; } -.ico.renamed:before { content: "\f11c"; } -.ico.repos:before { content: "\f11d"; } -.ico.rubbish:before { content: "\f11e"; } +.ico.quote:before { content: "\f119"; } +.ico.removed:before { content: "\f11a"; } +.ico.renamed:before { content: "\f11b"; } +.ico.repos:before { content: "\f11c"; } +.ico.rubbish:before { content: "\f11d"; } +.ico.save:before { content: "\f11e"; } .ico.saving:before { content: "\f11f"; } .ico.search:before { content: "\f120"; } .ico.sprocket:before { content: "\f121"; } @@ -1706,31 +1702,17 @@ ins { .sidebar .commit { position:relative; bottom:-4px; - display:none; } - .sidebar .commit .cancel { - position:absolute; - z-index:10; - top:30px; - right:5px; - display:block; - } - .cancel:hover { - color:#DB6F6F; - } - .sidebar .commit textarea { - padding-right:25px; - margin:8px 0 -2px; - display:block; - position:relative; - z-index:1; - height:90px; - resize:none; - -webkit-border-radius:4px 4px 0 0; - border-radius:4px 4px 0 0; - } - .sidebar .commit.active { + .sidebar .commit textarea { + padding-right:25px; + margin:8px 0 -2px; display:block; + position:relative; + z-index:1; + height:115px; + resize:none; + -webkit-border-radius:4px 4px 0 0; + border-radius:4px 4px 0 0; } /* ------------------------------------------ diff --git a/fonts/prose-80081ddd6bb627b0784ec9094fabb857.eot b/fonts/prose-129b77953cd92a716f7e5224f4de015e.eot similarity index 73% rename from fonts/prose-80081ddd6bb627b0784ec9094fabb857.eot rename to fonts/prose-129b77953cd92a716f7e5224f4de015e.eot index e07e4fd35cf00344054de5e71f85d617d017eb2c..19ef37eea9e9f9e6ba4832938962e96c82b0f7c4 100644 GIT binary patch delta 288 zcmaE(|3aVjg*XF)%S2XlmQ}(Q5fdFs*`NOBVPFu~n7GHDQDNdAN#;xQt0qe@>N58@ zwoUe6lyMOIq0-I3ARNQMz+_X9UtDt2Zi6NRgXjzf2F5l9Mg}0ozz|^}yegjG<|_j? z^9!H|!`Ul(axi-H5=ITi$rqSJm{{00KVq87$a#kK8=D4O09)DS29{Lr&4B__7$-mF z&)NJ`(2q%7fl&->Dgy%x11qC5l+DT@z?cnXvjN3BCP#_rsyi@TVPIxpWZ?v=hjI1UMx(sHMcZsSno9LQNek2;V*->l(BR7&u0c?UmkpKVy delta 307 zcmaE%|3;tnjW`2?$3#|h7EkpZ_a-`&vfrM$hJis`XW|}vMwN+wB$-cGNllhu)MZ}g zxM8vfql`oFrl(#E48k!C3{3U~`NbtS?KWsKFo@1!U|?)xU}OMN3=H>nsC&lq+k9o< zW_|$_VK{s4cOH!1yo6DMQH+I+fuGq9h!;We6$XB$d7B?GO=aYK#Ky#?!xqQZwz+{N zm3wlfV9w^J{8Jb=KNa+2QdeY@0NcXAz{0@F=mur8G6*o{LD_6T@$Sh{BD(5M3|APK z85mhOfoi!Jt)OgH1_eeRD4Pu^UcY&r2rDDIF@qt4E`#ah9il2M#)i74lkbbhZMG3x J$jFW4cmRw)NLK&= diff --git a/fonts/prose-129b77953cd92a716f7e5224f4de015e.woff b/fonts/prose-129b77953cd92a716f7e5224f4de015e.woff new file mode 100644 index 0000000000000000000000000000000000000000..1c378de228d4e86b81404e8d5780bdd13c7ef041 GIT binary patch literal 3784 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 B)2RRe diff --git a/src/prose/models.js b/src/prose/models.js index 7234ca0cf..6888f7dbe 100644 --- a/src/prose/models.js +++ b/src/prose/models.js @@ -845,7 +845,7 @@ module.exports = { q.await((function() { cb(err, _.extend(post, { 'default_metadata': defaultMetadata, - 'markdown': _.markdown(file), + 'markdown': _.markdown(file.split('?')[0]), 'repo': repo, 'path': path, 'file': file.split('?')[0], diff --git a/src/prose/views/app.js b/src/prose/views/app.js index aa0e8db5b..2db6beb57 100644 --- a/src/prose/views/app.js +++ b/src/prose/views/app.js @@ -14,9 +14,7 @@ module.exports = Backbone.View.extend({ 'click .logout': 'logout', 'click a.item.removed': 'restoreFile', 'click a.save': 'save', - 'click a.save.confirm': 'updateFile', - 'click a.quick-save': 'updateFile', - 'click a.cancel': 'cancelSave', + 'click a.confirm': 'updateFile', 'click a.delete': 'deleteFile', 'click a.translate': 'translate', 'click .mobile-menu .toggle': 'toggleMobileClass', @@ -75,6 +73,7 @@ module.exports = Backbone.View.extend({ var errorPage = false; var hideInterface = false; // Flag for unauthenticated landing this.noMenu = false; // Prevents a mobile toggle from appearing when nto required. + this.viewing = app.state.mode; if (options) { if (options.hideInterface) hideInterface = options.hideInterface; @@ -98,10 +97,8 @@ module.exports = Backbone.View.extend({ // When the sidebar should be open. // Fix this in re-factor, could be much tighter - if (app.state.mode === 'tree') { - $('#prose').toggleClass('open', true); - $('#prose').toggleClass('mobile', false); - } else if (app.state.mode === '' && window.authenticated && app.state.user !== '') { + if (app.state.mode === 'tree' || + app.state.mode === '' && window.authenticated && app.state.user) { $('#prose').toggleClass('open', true); $('#prose').toggleClass('mobile', false); } else { @@ -122,8 +119,12 @@ module.exports = Backbone.View.extend({ }, headerContext: function(data, alterable) { - var view = this; var heading = _(window.app.templates.heading).template(); + + if (data.writable) this.writable = true; + if (data.lang) this.lang = data.lang; + if (data.metadata) this.metadata = data.metadata; + $('#heading').empty().append(heading(_.extend(data, { alterable: alterable ? true : false }))); @@ -134,23 +135,20 @@ module.exports = Backbone.View.extend({ }, sidebarContext: function(data) { - var sidebarTmpl; - if (app.state.mode === 'tree') { - sidebarTmpl = _(app.templates.sidebarProject).template(); - } else if (data.file) { - this.writable = data.writable; - sidebarTmpl = _(app.templates.settings).template(); + var tmpl = _(app.templates.sidebarProject).template(); + + // Branch Switching + _.defer(function() { + $('.chzn-select', this.el).chosen().change(function() { + router.navigate($(this).val(), true); + }); + }); + + $('#drawer', this.el) + .empty() + .append(tmpl(data)); } - - $('#drawer', this.el) - .empty() - .append(sidebarTmpl(data)); - - // Branch Switching - $('.chzn-select', this.el).chosen().change(function() { - router.navigate($(this).val(), true); - }); }, recentFiles: function(data) { @@ -185,16 +183,27 @@ module.exports = Backbone.View.extend({ }, settings: function(e) { - $navItems = $('.navigation a', this.el); - if (!this.viewing) this.viewing = app.state.mode; + var tmpl = _(app.templates.settings).template(); + var $navItems = $('.navigation a', this.el); if ($(e.target, this.el).hasClass('active')) { $navItems.removeClass('active'); $('.navigation .' + this.viewing, this.el).addClass('active'); $('#prose').toggleClass('open mobile', false); + + this.cancelSave(); } else { $navItems.removeClass('active'); $(e.target, this.el).addClass('active'); + + $('#drawer', this.el) + .empty() + .append(tmpl({ + lang: this.lang, + writable: this.writable, + metadata: this.metadata + })); + $('#prose').toggleClass('open mobile', true); } @@ -258,31 +267,46 @@ module.exports = Backbone.View.extend({ }, save: function(e) { + var tmpl = _(app.templates.sidebarSave).template(); this.eventRegister.trigger('save', e); + $navItems = $('.navigation a', this.el); - var $message = $('.commit-message', this.el); - var filepath = $('input.filepath').val(); - var filename = _.extractFilename(filepath)[1]; - var placeholder = 'Updated ' + filename; - if (app.state.mode === 'new') placeholder = 'Created ' + filename; + if ($(e.target, this.el).hasClass('active')) { + $navItems.removeClass('active'); + $('.navigation .' + this.viewing, this.el).addClass('active'); + $('#prose').toggleClass('open mobile', false); + this.cancelSave(); + } else { + $navItems.removeClass('active'); + $(e.target, this.el).addClass('active'); + + $('#drawer', this.el) + .empty() + .append(tmpl({ + writable: this.writable + })); - $('.commit', this.el).toggleClass('active', true); - $('.button.save', this.el).toggleClass('confirm', true); + $('#prose').toggleClass('open mobile', true); + + var $message = $('.commit-message', this.el); + var filepath = $('input.filepath').val(); + var filename = _.extractFilename(filepath)[1]; + var placeholder = 'Updated ' + filename; + if (app.state.mode === 'new') placeholder = 'Created ' + filename; - $('.button.save', this.el) - .html($('.button.save', this.el) - .hasClass('confirm') ? - (this.writable ? 'Commit' : 'Send Change Request') : - (this.writable ? 'Save' : 'Submit Change')); + $('.confirm', this.el) + .html($('.button.save', this.el) + .hasClass('confirm') ? + (this.writable ? 'Commit' : 'Send Change Request') : + (this.writable ? 'Save' : 'Submit Change')); - $message.attr('placeholder', placeholder).focus(); + $message.attr('placeholder', placeholder).focus(); + } return false; }, cancelSave: function(e) { - $('.commit', this.el).toggleClass('active', false); - $('.button.save', this.el).toggleClass('confirm', false); this.eventRegister.trigger('cancelSave', e); return false; }, diff --git a/src/prose/views/post.js b/src/prose/views/post.js index 017c2aef3..8c1f4d2e2 100644 --- a/src/prose/views/post.js +++ b/src/prose/views/post.js @@ -89,7 +89,6 @@ module.exports = Backbone.View.extend({ this.eventRegister.bind('remove', this.remove); this.eventRegister.bind('cancelSave', this.cancelSave); - this.eventRegister.trigger('sidebarContext', this.data); this.renderHeading(); var tmpl = _(window.app.templates.post).template(); @@ -143,7 +142,9 @@ module.exports = Backbone.View.extend({ title: _.filepath(this.data.path, this.data.file), writable: this.model.writable, alterable: true, - translate: this.data.translate + translate: this.data.translate, + lang: this.data.lang, + metadata: this.data.metadata }; this.eventRegister.trigger('headerContext', this.header, true); @@ -470,11 +471,6 @@ module.exports = Backbone.View.extend({ view.model.persisted = true; view.model.file = filename; - if (app.state.mode === 'new') { - app.state.mode = 'edit'; - view.eventRegister.trigger('sidebarContext', view.data); - } - view.renderHeading(); view.updateURL(); view.prevFile = filecontent; diff --git a/templates/app.html b/templates/app.html index 5341c1429..f0d05e933 100644 --- a/templates/app.html +++ b/templates/app.html @@ -52,7 +52,7 @@
  • - + Save
    • diff --git a/templates/settings.html b/templates/settings.html index 1bc2438f3..ff5398493 100644 --- a/templates/settings.html +++ b/templates/settings.html @@ -1,20 +1,8 @@ <% if (window.authenticated) { %>
    -

    Post Settings

    +

    Post Options

    -
    -

    Describe you changes

    - - - Cancel - -
    - - - <%= writable ? 'Save' : 'Submit Change' %> - - <% if (app.state.config && app.state.config.languages && lang !== 'yaml') { %> <% _(app.state.config.languages).each(function(lang) { %> <% if (lang.value && (metadata && metadata.lang !== lang.value)) { %> diff --git a/templates/sidebarSave.html b/templates/sidebarSave.html new file mode 100644 index 000000000..c827e28df --- /dev/null +++ b/templates/sidebarSave.html @@ -0,0 +1,12 @@ +<% if (window.authenticated) { %> +
    +

    Describe your Changes

    +
    +
    +
    + +
    + + Save +
    +<% } %>