Merge branch 'master' of github.com:LaravelIO/laravel-io

Author: Shawn McCool

app/domain/Lio/Comments/CommentPresenter.php

@@ -1,9 +1,7 @@
 <?php namespace Lio\Comments;
 
 use McCool\LaravelAutoPresenter\BasePresenter;
-use App;
-
-use Str;
+use App, Input, Str, Request;
 
 class CommentPresenter extends BasePresenter
 {
@@ -18,12 +16,17 @@ public function forumThreadUrl()
 
     public function commentUrl()
     {
+        $pagination = null;
         $slug = $this->resource->parent->slug;
 
         if ( ! $slug) return '';
 
+        if( Input::has('page')) {
+            $pagination = '?page=' . Input::get('page');
+        }
+
         $url = action('ForumController@getThread', [$slug->slug]);
-        return $url . "#comment-{$this->id}";
+        return $url . $pagination . "#comment-{$this->id}";
     }
 
     public function child_count_label()

app/views/forum/editthread.blade.php

@@ -1,7 +1,16 @@
+@extends('layouts._two_columns_left_sidebar')
+
+@section('sidebar')
+    @include('forum._sidebar')
+@stop
+
+@section('content')
+<div class="row forum">
+    <div class="small-12 columns form">
 {{ Form::model($thread->resource) }}
 
     <fieldset>
-        <legend>Create Thread</legend>
+        <legend>Edit Thread</legend>
 
         <div class="row">
             <div class="">
@@ -44,6 +53,8 @@
 
 {{ Form::close() }}
 
+@stop
+
 @include('layouts._markdown_editor')
 
 @section('scripts')

app/views/forum/thread.blade.php

@@ -39,3 +39,9 @@
 
 @include('layouts._markdown_editor')
 @include('layouts._code_prettify')
+
+
+@section('scripts')
+    @parent
+    <script src="{{ asset('javascripts/forums.js') }}"></script>
+@stop

public/javascripts/forums.js

@@ -6,4 +6,14 @@ function limitTagCheckboxes()
     });
 }
 
-limitTagCheckboxes();
+function moveSidebar()
+{
+    $( "window" ).bind( "resize", function() {
+        if (document.width < '800') {
+            $('.sidebar').insertAfter('section.content');
+        }
+    });
+}
+
+limitTagCheckboxes();
+moveSidebar();