Index Layout

.idea/workspace.xml

@@ -2,7 +2,6 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="80f2fc29-4939-4e5d-80a5-cd8ec589ca07" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/models/Comment.php" afterPath="$PROJECT_DIR$/app/models/Comment.php" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/index.blade.php" afterPath="$PROJECT_DIR$/app/views/index.blade.php" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
@@ -43,15 +42,16 @@
       <file leaf-file-name="index.blade.php" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/app/views/index.blade.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.28688523">
-              <caret line="105" column="85" selection-start-line="105" selection-start-column="85" selection-end-line="105" selection-end-column="85" />
+            <state vertical-scroll-proportion="0.6803279">
+              <caret line="100" column="8" selection-start-line="100" selection-start-column="8" selection-end-line="100" selection-end-column="8" />
               <folding>
-                <element signature="e#314#360#0#HTML" expanded="true" />
-                <element signature="e#1728#1774#0#HTML" expanded="true" />
-                <element signature="e#3948#3994#0#HTML" expanded="true" />
-                <element signature="e#4723#4750#0#HTML" expanded="true" />
-                <element signature="e#5346#5375#0#HTML" expanded="true" />
-                <element signature="e#5634#5680#0#HTML" expanded="true" />
+                <element signature="e#264#310#0#HTML" expanded="true" />
+                <element signature="e#1033#1079#0#HTML" expanded="true" />
+                <element signature="e#2447#2493#0#HTML" expanded="true" />
+                <element signature="e#3867#3913#0#HTML" expanded="true" />
+                <element signature="e#5268#5295#0#HTML" expanded="true" />
+                <element signature="e#5592#5637#0#HTML" expanded="true" />
+                <element signature="e#5891#5920#0#HTML" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -233,8 +233,8 @@
     </include_path>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="123" />
-    <option name="y" value="125" />
+    <option name="x" value="48" />
+    <option name="y" value="212" />
     <option name="width" value="1797" />
     <option name="height" value="955" />
   </component>
@@ -424,11 +424,17 @@
       <option name="project" value="LOCAL" />
       <updated>1445403749673</updated>
     </task>
-    <option name="localTasksCounter" value="4" />
+    <task id="LOCAL-00004" summary="Kommentaranzeige.">
+      <created>1445405348611</created>
+      <option name="number" value="00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1445405348611</updated>
+    </task>
+    <option name="localTasksCounter" value="5" />
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="123" y="125" width="1797" height="955" extended-state="0" />
+    <frame x="48" y="212" width="1797" height="955" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -489,7 +495,8 @@
   <component name="VcsManagerConfiguration">
     <MESSAGE value="Winter style" />
     <MESSAGE value="Sommer Style, Avatare, Duplikate" />
-    <option name="LAST_COMMIT_MESSAGE" value="Sommer Style, Avatare, Duplikate" />
+    <MESSAGE value="Kommentaranzeige." />
+    <option name="LAST_COMMIT_MESSAGE" value="Kommentaranzeige." />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
@@ -877,15 +884,16 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/app/views/index.blade.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.28688523">
-          <caret line="105" column="85" selection-start-line="105" selection-start-column="85" selection-end-line="105" selection-end-column="85" />
+        <state vertical-scroll-proportion="0.6803279">
+          <caret line="100" column="8" selection-start-line="100" selection-start-column="8" selection-end-line="100" selection-end-column="8" />
           <folding>
-            <element signature="e#314#360#0#HTML" expanded="true" />
-            <element signature="e#1728#1774#0#HTML" expanded="true" />
-            <element signature="e#3948#3994#0#HTML" expanded="true" />
-            <element signature="e#4723#4750#0#HTML" expanded="true" />
-            <element signature="e#5346#5375#0#HTML" expanded="true" />
-            <element signature="e#5634#5680#0#HTML" expanded="true" />
+            <element signature="e#264#310#0#HTML" expanded="true" />
+            <element signature="e#1033#1079#0#HTML" expanded="true" />
+            <element signature="e#2447#2493#0#HTML" expanded="true" />
+            <element signature="e#3867#3913#0#HTML" expanded="true" />
+            <element signature="e#5268#5295#0#HTML" expanded="true" />
+            <element signature="e#5592#5637#0#HTML" expanded="true" />
+            <element signature="e#5891#5920#0#HTML" expanded="true" />
           </folding>
         </state>
       </provider>

app/views/index.blade.php

@@ -3,6 +3,18 @@
 @section('content')
 <div class="row">
 	<div class="col-md-6">
+		<div class="panel panel-primary">
+			<div class="panel-heading">N&auml;chster Film</div>
+			<div class="panel-body">
+				<img src="{{$images["next"]}}" class="pull-left thumbnail" style="max-height: 100px; margin-right: 15px;">
+				<h4>{{is_object($nextfilm) ? $nextfilm->name . " <small><i>(" . $nextfilm->besitzer->name . ")</i></small>" : "Steht nicht fest"}}</h4>
+				@if(is_object($nextfilm)) {{ link_to_route('film', "Filmdetails", array($nextfilm->id), array('class' => 'btn btn-info btn-xs'))}}
+				@endif
+				@if(is_object($nextfilm) && !is_null(Auth::user()) && Auth::user()->admin)	<a href='{{ url('mark-read/' . $nextfilm->id) }}' class='btn btn-success btn-xs'>Gesehen</a>
+				@endif
+			</div>
+		</div>
+
 		<div class="panel panel-primary">
 			<div class="panel-heading">Meistgew&uuml;nschter Film</div>
 			<div class="panel-body">
@@ -59,37 +71,40 @@
 				</div>
 			</div>
 
-			<div class="panel-group" id="accordion">
-				@foreach ($news as $new)
-					<div class="panel panel-info">
-						<div class="panel-heading">
-							<h4 class="panel-title">
-								<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#news{{$new->id}}">{{$new->headline}}</a>
-								<small>
-									<span class="badge">
-										<img class="img-circle" src="{{ $new->ersteller->getAvatar() }}" width="16"> {{$new->ersteller->name}}
-									</span> - {{\Carbon\Carbon::parse($new->updated_at)->format('d.m.Y')}}</small>
-							</h4>
-						</div>
-						<div id="news{{$new->id}}" class="panel-collapse collapse {{$new === $news[0] ? "in" : ""}}">
-							<div class="panel-body">{{nl2br(htmlentities($new->body))}}</div>
-						</div>
-					</div>
+		<div class="panel panel-danger">
+			<div class="panel-heading">Gesehene Filme</div>
+			<div class="panel-body">
+				<?php $topfilm = $gesehen->shift(); ?>
+				<img src="{{$images["alt"]}}" class="pull-left thumbnail" style="max-height: 100px; margin-right: 15px;">
+				<h4>{{$topfilm->name}}
+					<small><span class="badge">
+						<img class="img-circle" src="{{ $topfilm->besitzer->getAvatar() }}" width="20"> {{$topfilm->besitzer->name}}
+					</span></small></h4>
+				<p>Bewertung:
+					@if($topfilm->getBewertung() > 0)
+						<span class="label label-{{$labels[round($topfilm->getBewertung())]}}">{{$topfilm->getBewertung()}}</span>
+						@else
+						&mdash;
+					@endif
+				</p>
+				<p>{{ link_to_route('film', "Filmdetails", array($topfilm->id), array('class' => 'btn btn-info btn-xs'))}}</p>
+			</div>
+
+			<div class="list-group">
+				@foreach ($gesehen as $film)
+					<a href="{{ route('film', array($film->id)); }}" class="list-group-item">{{$film->name}} <small><span class="badge">
+						<img class="img-circle" src="{{ $film->besitzer->getAvatar() }}" width="16"> {{$film->besitzer->name}}
+					</span></small></a>
 				@endforeach
+				<i>{{ link_to('gesehen', 'Mehr...', array('class' => 'list-group-item')); }}</i>
 			</div>
+		</div>
 	</div>
 
 	<div class="col-md-6">
-		<div class="panel panel-primary">
-			<div class="panel-heading">N&auml;chster Film</div>
-			<div class="panel-body">
-				<img src="{{$images["next"]}}" class="pull-left thumbnail" style="max-height: 100px; margin-right: 15px;">
-				<h4>{{is_object($nextfilm) ? $nextfilm->name . " <small><i>(" . $nextfilm->besitzer->name . ")</i></small>" : "Steht nicht fest"}}</h4>
-				@if(is_object($nextfilm)) {{ link_to_route('film', "Filmdetails", array($nextfilm->id), array('class' => 'btn btn-info btn-xs'))}}
-				@endif
-				@if(is_object($nextfilm) && !is_null(Auth::user()) && Auth::user()->admin)	<a href='{{ url('mark-read/' . $nextfilm->id) }}' class='btn btn-success btn-xs'>Gesehen</a>
-				@endif
-			</div>
+		<div class="jumbotron">
+			<h1>Dumbo</h1>
+			<p>Suchst du noch oder guckst du schon?</p>
 		</div>
 
 		<div class="panel panel-default">
@@ -113,35 +128,26 @@
 				@endforeach		
 			</div>
 		</div>
-
-		<div class="panel panel-danger">
-			<div class="panel-heading">Gesehene Filme</div>
-			<div class="panel-body">
-				<?php $topfilm = $gesehen->shift(); ?>
-				<img src="{{$images["alt"]}}" class="pull-left thumbnail" style="max-height: 100px; margin-right: 15px;">
-				<h4>{{$topfilm->name}}
-					<small><span class="badge">
-						<img class="img-circle" src="{{ $topfilm->besitzer->getAvatar() }}" width="20"> {{$topfilm->besitzer->name}}
-					</span></small></h4>
-				<p>Bewertung:
-					@if($topfilm->getBewertung() > 0)
-						<span class="label label-{{$labels[round($topfilm->getBewertung())]}}">{{$topfilm->getBewertung()}}</span>
-					@else
-						&mdash;
-					@endif
-				</p>
-				<p>{{ link_to_route('film', "Filmdetails", array($topfilm->id), array('class' => 'btn btn-info btn-xs'))}}</p>
-			</div>
-
-			<div class="list-group">
-				@foreach ($gesehen as $film)
-					<a href="{{ route('film', array($film->id)); }}" class="list-group-item">{{$film->name}} <small><span class="badge">
-						<img class="img-circle" src="{{ $film->besitzer->getAvatar() }}" width="16"> {{$film->besitzer->name}}
-					</span></small></a>
-				@endforeach
-				<i>{{ link_to('gesehen', 'Mehr...', array('class' => 'list-group-item')); }}</i>
-			</div>
+		<div class="panel-group" id="accordion">
+			@foreach ($news as $new)
+				<div class="panel panel-info">
+					<div class="panel-heading">
+						<h4 class="panel-title">
+							<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#news{{$new->id}}">{{$new->headline}}</a>
+							<small>
+									<span class="badge">
+										<img class="img-circle" src="{{ $new->ersteller->getAvatar() }}" width="16"> {{$new->ersteller->name}}
+									</span> - {{\Carbon\Carbon::parse($new->updated_at)->format('d.m.Y')}}</small>
+						</h4>
+					</div>
+					<div id="news{{$new->id}}" class="panel-collapse collapse {{$new === $news[0] ? "in" : ""}}">
+						<div class="panel-body">{{nl2br(htmlentities($new->body))}}</div>
+					</div>
+				</div>
+			@endforeach
 		</div>
+
+	</div>
 	</div>
 </div>