From bc00c0f2ae19bc58b4974c0284eb04be9cd1d242 Mon Sep 17 00:00:00 2001 From: Eston Bond Date: Mon, 8 Nov 2010 13:57:48 -0800 Subject: [PATCH] Adding footer and sidebar fields to editor --- lib/gollum/frontend/public/css/editor.css | 106 +++++++++++++++++- .../frontend/public/images/icon-sprite.png | Bin 7876 -> 9668 bytes .../javascript/gollum-editor/gollum.editor.js | 15 ++- lib/gollum/frontend/templates/editor.mustache | 14 +++ scratch/TODO | 6 +- 5 files changed, 133 insertions(+), 8 deletions(-) diff --git a/lib/gollum/frontend/public/css/editor.css b/lib/gollum/frontend/public/css/editor.css index 525f1fe0..31a1e9ee 100644 --- a/lib/gollum/frontend/public/css/editor.css +++ b/lib/gollum/frontend/public/css/editor.css @@ -46,7 +46,7 @@ font-size: 1.3em; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; line-height: 1.8em; - margin: 0; + margin: 1em 0 0.4em; padding: 0.5em; width: 98%; } @@ -55,8 +55,9 @@ color: #999; } -#gollum-editor-title-field input { +#gollum-editor-title-field input#gollum-editor-page-title { font-weight: bold; + margin-top: 0; } #gollum-editor-title-field.active { @@ -79,7 +80,7 @@ #gollum-editor #gollum-editor-function-bar { border-bottom: 1px solid #ddd; overflow: hidden; - padding: 0 0 0.5em 0; + padding: 0.6em 0 1.1em 0; display: none; } @@ -204,7 +205,7 @@ a#function-image:hover span { background-position: -324px -28px; } font-size: 1.3em; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; line-height: 1.8em; - margin: 0.5em 0; + margin: 1em 0 0.4em; padding: 0.5em; /* I don't really like mixing pct & em here… */ width: 98%; height: 20em; @@ -248,6 +249,103 @@ a#function-image:hover span { background-position: -324px -28px; } background: -moz-linear-gradient(top, #599bdc, #3072b3); } +#gollum-editor .collapsed, +#gollum-editor .expanded { + border-bottom: 1px solid #ddd; + display: block; + overflow: hidden; + padding: 1em 0 0.5em; +} + +#gollum-editor #gollum-editor-body + .collapsed, +#gollum-editor #gollum-editor-body + .expanded { + border-top: 1px solid #ddd; + margin-top: 0.7em; +} + +#gollum-editor .collapsed a.button, +#gollum-editor .expanded a.button { + background: #f7f7f7; + border: 1px solid #ddd; + color: #333; + display: block; + float: left; + height: 25px; + overflow: hidden; + margin: 0.2em 0.5em 0.75em 0; + text-shadow: 0 1px 0 #fff; + width: 25px; + + border-radius: 0.3em; + -moz-border-radius: 0.3em; + -webkit-border-radius: 0.3em; + + filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#f4f4f4', endColorstr='#ececec'); + background: -webkit-gradient(linear, left top, left bottom, from(#f4f4f4), to(#ececec)); + background: -moz-linear-gradient(top, #f4f4f4, #ececec); +} + +#gollum-editor .collapsed h4, +#gollum-editor .expanded h4 { + font-size: 1.6em; + float: left; + margin: 0; + padding: 0.4em 0 0 0.3em; + text-shadow: 0 -1px 0 #fff; +} + +#gollum-editor .collapsed a.button:hover, +#gollum-editor .expanded h4 a.button:hover { + color: #fff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3); + text-decoration: none; + + filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#599bdc', endColorstr='#3072b3'); + background: -webkit-gradient(linear, left top, left bottom, from(#599bdc), to(#3072b3)); + background: -moz-linear-gradient(top, #599bdc, #3072b3); +} + +#gollum-editor .collapsed a span, +#gollum-editor .expanded a span { + background-image: url(../images/icon-sprite.png); + background-position: -351px -1px; + background-repeat: no-repeat; + display: block; + height: 25px; + overflow: hidden; + text-indent: -5000px; + width: 25px; +} + +#gollum-editor .collapsed a:hover span { + background-position: -351px -28px; +} + +#gollum-editor .expanded a span { + background-position: -378px 0; +} + +#gollum-editor .expanded a:hover span { + background-position: -378px -28px; +} + +#gollum-editor .collapsed textarea { + display: none; +} + +#gollum-editor .expanded textarea { + border: 1px solid #ddd; + clear: both; + display: block; + font-size: 1.3em; + font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; + height: 7em; + line-height: 1.8em; + margin: 0.7em 0; + padding: 0.5em; + width: 98%; +} + /* @control dialog */ diff --git a/lib/gollum/frontend/public/images/icon-sprite.png b/lib/gollum/frontend/public/images/icon-sprite.png index 6ed7ee6c0de6266ce0e5148c150ef155407b5e48..20dac3b2ff954818538d15034418ee33e42d2b1d 100644 GIT binary patch delta 8915 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 delta 7107 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 diff --git a/lib/gollum/frontend/public/javascript/gollum-editor/gollum.editor.js b/lib/gollum/frontend/public/javascript/gollum-editor/gollum.editor.js index 1e027bf9..34485953 100644 --- a/lib/gollum/frontend/public/javascript/gollum-editor/gollum.editor.js +++ b/lib/gollum/frontend/public/javascript/gollum-editor/gollum.editor.js @@ -39,6 +39,15 @@ Placeholder.add( $('#gollum-editor-edit-summary input') ) } + if ( EditorHas.collapsibleInputs() ) { + $('#gollum-editor .collapsed a.button, ' + + '#gollum-editor .expanded a.button').click(function( e ) { + e.preventDefault(); + $(this).parent().toggleClass('expanded'); + $(this).parent().toggleClass('collapsed'); + }); + } + // Initialize the function bar by loading proper definitions if ( EditorHas.functionBar() ) { var htmlSetMarkupLang = @@ -214,6 +223,10 @@ $('#gollum-editor-body').length ); }, + collapsibleInputs: function() { + return $('#gollum-editor .collapsed, #gollum-editor .expanded').length; + }, + /** * EditorHas.functionBar @@ -662,6 +675,6 @@ return ( _PLACEHOLDERS.length ); } - } + }; // })(jQuery); diff --git a/lib/gollum/frontend/templates/editor.mustache b/lib/gollum/frontend/templates/editor.mustache index aac9180a..c2baa6d3 100644 --- a/lib/gollum/frontend/templates/editor.mustache +++ b/lib/gollum/frontend/templates/editor.mustache @@ -37,12 +37,26 @@
+ + + + +
+
diff --git a/scratch/TODO b/scratch/TODO index 3ca791b6..c4986b97 100644 --- a/scratch/TODO +++ b/scratch/TODO @@ -1,9 +1,9 @@ * Editor * Add sidebar field * Add footer field - * Add edit summary field * Create rest of markup lang definitions * Create Error Page -* Create Compare Revisions Page +* Create Compare Revisions Page (like, when comparing the two) * Create Search Results Page -* Write Editor/Sidebar implementation notes for Rick \ No newline at end of file +* Write Editor/Sidebar implementation notes for Rick +* Write print.css \ No newline at end of file