Preview now via POST, closes #63

Improving style, refs #30

Author: philipsorst

composer.lock

@@ -3,7 +3,6 @@
 
 namespace Net\Dontdrinkandroot\Gitki\BaseBundle\Controller;
 
-
 use GitWrapper\GitException;
 use Net\Dontdrinkandroot\Gitki\BaseBundle\Exception\PageLockedException;
 use Net\Dontdrinkandroot\Utils\Path\DirectoryPath;
@@ -155,7 +154,7 @@ public function showPageAction(Request $request, FilePath $path)
      */
     public function previewMarkdownAction(Request $request, FilePath $path)
     {
-        $markdown = $request->query->get('markdown');
+        $markdown = $request->request->get('markdown');
         $html = $this->getWikiService()->preview($path, $markdown);
 
         return new Response($html);
@@ -239,7 +238,7 @@ public function editPageAction(Request $request, FilePath $path)
                         'save' => array('type' => 'submit', 'options' => array('label' => 'Save')),
                         'cancel' => array(
                             'type' => 'submit',
-                            'options' => array('label' => 'Cancel', 'attr' => array('type' => 'default'))
+                            'options' => array('label' => 'Cancel', 'button_class' => 'default')
                         ),
                     )
                 )
@@ -278,7 +277,6 @@ public function editPageAction(Request $request, FilePath $path)
             } catch (GitException $e) {
                 throw $e;
             }
-
         } else {
 
             $content = null;
@@ -355,7 +353,6 @@ public function renameFileAction(Request $request, FilePath $path)
                     )
                 );
             }
-
         } else {
             $form->setData(array('newpath' => $path->toAbsoluteUrlString()));
         }
@@ -366,7 +363,6 @@ public function renameFileAction(Request $request, FilePath $path)
         );
     }
 
-
     /**
      * @param Request  $request
      * @param FilePath $path
@@ -569,7 +565,6 @@ public function addPageAction(Request $request, DirectoryPath $path)
                     )
                 );
             }
-
         }
 
         return $this->render(
@@ -621,7 +616,6 @@ public function addFolderAction(Request $request, DirectoryPath $path)
                     )
                 );
             }
-
         }
 
         return $this->render(
@@ -637,16 +631,7 @@ public function addFolderAction(Request $request, DirectoryPath $path)
      */
     public function historyAction()
     {
-        $history = [];
-        try {
-            $history = $this->getWikiService()->getHistory(20);
-        } catch (GitException $e) {
-            if ($e->getMessage() === "fatal: bad default revision 'HEAD'\n") {
-                /* swallow, history not there yet */
-            } else {
-                throw $e;
-            }
-        }
+        $history = $this->getWikiService()->getHistory(20);
 
         return $this->render('DdrGitkiBaseBundle:Wiki:history.html.twig', array('history' => $history));
     }
@@ -682,6 +667,4 @@ protected function checkPreconditions(Request $request, $path)
             throw new AccessDeniedHttpException();
         }
     }
-
-
 }

src/Net/Dontdrinkandroot/Gitki/BaseBundle/Controller/WikiController.php

@@ -46,6 +46,7 @@ div.dropdown {
 }
 
 .breadcrumb {
+
     a {
         color: @gray-dark;
     }
@@ -57,4 +58,10 @@ div.dropdown {
 
 .margin-bottom-none {
     margin-bottom: 0px;
+}
+
+/* Highlight JS customizations */
+
+.hljs {
+    background: @gray-lightestest;
 }

src/Net/Dontdrinkandroot/Gitki/BaseBundle/Resources/public/css/custom.less

@@ -1,4 +1,7 @@
 .navbar{display:none}
 a{color:#000}
+.toc{display:none}
+table{width:100%}
+table,th,td{border:1px solid #000}
 .wiki .breadcrumb{display:none}
 .wiki .global-actions,.wiki .item-actions{display:none}

src/Net/Dontdrinkandroot/Gitki/BaseBundle/Resources/public/css/print.css

@@ -6,6 +6,18 @@ a {
     color: black;
 }
 
+.toc {
+    display: none;
+}
+
+table {
+    width: 100%;
+}
+
+table, th, td {
+    border: 1px solid black;
+}
+
 .wiki {
 
     .breadcrumb {

src/Net/Dontdrinkandroot/Gitki/BaseBundle/Resources/public/css/print.less

@@ -40,4 +40,9 @@
 @navbar-default-link-hover-color: @gray-darker;
 
 @breadcrumb-active-color: @gray;
-@breadcrumb-bg: transparent;
+@breadcrumb-bg: transparent;
+
+@code-bg: @gray-lightestest;
+@pre-bg: @gray-lightestest;
+
+@blockquote-font-size: @font-size-base;

src/Net/Dontdrinkandroot/Gitki/BaseBundle/Resources/public/css/style.css

@@ -40,7 +40,7 @@
 
             this.update = function () {
                 $('.loading-indicator .spinner').show();
-                $.get(previewUrl, {'markdown': input.val()})
+                $.post(previewUrl, {'markdown': input.val()})
                         .done(function (data) {
                             preview.html(data);
                             $('.loading-indicator .spinner').hide();

src/Net/Dontdrinkandroot/Gitki/BaseBundle/Resources/public/css/variables.less

@@ -88,6 +88,6 @@
     <script>hljs.initHighlightingOnLoad();</script>
 {% endblock %}
 {% block stylesheet %}
-    {{ parent() }}
     <link rel="stylesheet" href="http://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.1/styles/default.min.css">
+    {{ parent() }}
 {% endblock %}