Improved code pasting experience. Fixes #6

diff --git a/resources/assets/sass/_text.scss b/resources/assets/sass/_text.scss
index b6e50cc404f61ab3571c543407b5bd2c2392e2a0..3f236a9ebab697546cf529a834cd37fe3e4103c1 100644 (file)
--- a/resources/assets/sass/_text.scss
+++ b/resources/assets/sass/_text.scss
@@ -7,10 +7,6 @@ h1 {
   line-height: 1.22222222em;
   margin-top: 0.48888889em;
   margin-bottom: 0.48888889em;
   line-height: 1.22222222em;
   margin-top: 0.48888889em;
   margin-bottom: 0.48888889em;

-  //padding-bottom: 0.3333em;
-  //border-bottom: 1px solid #EAEAEA;
-  //margin-left: -$-xxl;
-  //margin-right: -$-xxl;

 }
 h2 {
   font-size: 2.8275em;
 }
 h2 {
   font-size: 2.8275em;


@@ -111,6 +107,13 @@ sup, .superscript {
 pre {
   font-family: monospace;
   white-space:pre;
 pre {
   font-family: monospace;
   white-space:pre;

+  font-size: 0.8em;
+  overflow: hidden;
+  border-radius: 4px;
+  box-shadow: 0 1px 2px 0px rgba(10, 10, 10, 0.06);
+  border: 1px solid rgba(221, 221, 221, 0.66);
+  background-color: #fdf6e3;
+  padding: 0.5em;

 }
 
 blockquote {
 }
 
 blockquote {

diff --git a/resources/assets/sass/styles.scss b/resources/assets/sass/styles.scss
index 23e7c900f97d17480ec9a882b1fc9586e06c1a6d..308dbd1ebd305886c0ffebebdfdff104842eccc2 100644 (file)
--- a/resources/assets/sass/styles.scss
+++ b/resources/assets/sass/styles.scss
@@ -146,6 +146,7 @@ header {
   margin-top: $-xxl;
   margin-left: 0;
   max-width: 240px;
   margin-top: $-xxl;
   margin-left: 0;
   max-width: 240px;

+  display: none;

 }
 
 .page-nav-list {
 }
 
 .page-nav-list {

diff --git a/resources/views/pages/form.blade.php b/resources/views/pages/form.blade.php
index 176475129e3743f88e7ce0f41620ffe89244040a..d81b2a2c4dcc6fc9eef1fabc6596ceecb0d9db0f 100644 (file)
--- a/resources/views/pages/form.blade.php
+++ b/resources/views/pages/form.blade.php
@@ -10,7 +10,11 @@
         </div>
     </div>
     <div class="edit-area">
         </div>
     </div>
     <div class="edit-area">

-        @include('form/textarea', ['name' => 'html'])
+        <textarea id="html" name="html" rows="5"
+                  @if($errors->has('html')) class="neg" @endif>@if(isset($model) || old('html')){{htmlspecialchars( old('html') ? old('html') : $model->html)}}@endif</textarea>
+        @if($errors->has('html'))
+            <div class="text-neg text-small">{{ $errors->first('html') }}</div>
+        @endif

     </div>
     <div class="margin-top large">
         <a onclick="window.history.back();" class="button muted">Cancel</a>
     </div>
     <div class="margin-top large">
         <a onclick="window.history.back();" class="button muted">Cancel</a>


@@ -37,8 +41,9 @@
             statusbar: false,
             menubar: false,
             height: 700,
             statusbar: false,
             menubar: false,
             height: 700,

-            plugins: "image table textcolor paste link imagetools fullscreen",
-            toolbar: "undo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | table image link | fullscreen",
+            extended_valid_elements: 'pre[*]',
+            plugins: "image table textcolor paste link imagetools fullscreen code",
+            toolbar: "code undo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | table image link | fullscreen",

             content_style: "body {padding-left: 15px !important; padding-right: 15px !important; margin:0!important; margin-left:auto!important;margin-right:auto!important;}",
             file_browser_callback: function(field_name, url, type, win) {
                 ImageManager.show(function(image) {
             content_style: "body {padding-left: 15px !important; padding-right: 15px !important; margin:0!important; margin-left:auto!important;margin-right:auto!important;}",
             file_browser_callback: function(field_name, url, type, win) {
                 ImageManager.show(function(image) {

diff --git a/resources/views/pages/revision.blade.php b/resources/views/pages/revision.blade.php
index 9f167895f2c1eee4301fd73a7d2d23ed203aaca4..4d8e04e3094faf4590af1b2f84507bb25b0a1256 100644 (file)
--- a/resources/views/pages/revision.blade.php
+++ b/resources/views/pages/revision.blade.php
@@ -6,4 +6,15 @@
         @include('pages/page-display')
     </div>
 
         @include('pages/page-display')
     </div>
 

+    <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.7/styles/solarized_light.min.css">
+    <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.7/highlight.min.js"></script>
+    <script>
+        window.onload = function() {
+            var aCodes = document.getElementsByTagName('pre');
+            for (var i=0; i < aCodes.length; i++) {
+                hljs.highlightBlock(aCodes[i]);
+            }
+        };
+    </script>
+

 @stop
 @stop

diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php
index 3149b6945f3619e337b57a6f3d8a94e8dbc52c03..6376e42bd4aedf77ba3ef1d4c2e814f7d3563160 100644 (file)
--- a/resources/views/pages/show.blade.php
+++ b/resources/views/pages/show.blade.php
@@ -62,6 +62,7 @@
                         header.smoothScrollTo();
                     })
                 });
                         header.smoothScrollTo();
                     })
                 });

+                $('.side-nav').fadeIn();

             } else {
                 $('.side-nav').hide();
             }
             } else {
                 $('.side-nav').hide();
             }


@@ -93,4 +94,15 @@
             //$('[data-toggle="popover"]').popover()
         });
     </script>
             //$('[data-toggle="popover"]').popover()
         });
     </script>

+
+    <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.7/styles/solarized_light.min.css">
+    <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.7/highlight.min.js"></script>
+    <script>
+        window.onload = function() {
+            var aCodes = document.getElementsByTagName('pre');
+            for (var i=0; i < aCodes.length; i++) {
+                hljs.highlightBlock(aCodes[i]);
+            }
+        };
+    </script>

 @stop
 @stop