Sommer Style, Avatare, Duplikate

.idea/workspace.xml

@@ -1,10 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="80f2fc29-4939-4e5d-80a5-cd8ec589ca07" name="Default" comment="Winter style">
+    <list default="true" id="80f2fc29-4939-4e5d-80a5-cd8ec589ca07" name="Default" comment="Sommer Style, Avatare, Duplikate">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/img/no-avatar.jpg" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/css/bootstrap-paper.min.css" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/css/bootstrap-readable.min.css" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/css/bootstrap-sandstone.min.css" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/fonts/glyphicons-halflings-regular.eot" afterPath="$PROJECT_DIR$/public/fonts/glyphicons-halflings-regular.eot" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/fonts/glyphicons-halflings-regular.ttf" afterPath="$PROJECT_DIR$/public/fonts/glyphicons-halflings-regular.ttf" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/fonts/glyphicons-halflings-regular.woff" afterPath="$PROJECT_DIR$/public/fonts/glyphicons-halflings-regular.woff" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/models/User.php" afterPath="$PROJECT_DIR$/app/models/User.php" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/film.blade.php" afterPath="$PROJECT_DIR$/app/views/film.blade.php" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/fonts/glyphicons-halflings-regular.svg" afterPath="$PROJECT_DIR$/public/fonts/glyphicons-halflings-regular.svg" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/hello.blade.php" afterPath="$PROJECT_DIR$/app/views/hello.blade.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$/app/routes.php" afterPath="$PROJECT_DIR$/app/routes.php" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/settings.blade.php" afterPath="$PROJECT_DIR$/app/views/settings.blade.php" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/suggest.blade.php" afterPath="$PROJECT_DIR$/app/views/suggest.blade.php" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
@@ -19,6 +30,10 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
+  <component name="ComposerSettings">
+    <pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath>
+    <pharPath>/usr/bin/composer</pharPath>
+  </component>
   <component name="CreatePatchCommitExecutor">
     <option name="PATCH_PATH" value="" />
   </component>
@@ -31,91 +46,104 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="routes.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/routes.php">
+      <file leaf-file-name="bootstrap-readable.min.css" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/public/css/bootstrap-readable.min.css">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-20.0" vertical-offset="0" max-vertical-offset="7542">
-              <caret line="39" column="23" selection-start-line="39" selection-start-column="23" selection-end-line="39" selection-end-column="23" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="12900" max-vertical-offset="13806">
+              <caret line="6" column="120273" selection-start-line="6" selection-start-column="120273" selection-end-line="6" selection-end-column="120273" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name=".htaccess" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/public/.htaccess">
+      <file leaf-file-name="hello.blade.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/views/hello.blade.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="234">
-              <caret line="6" column="31" selection-start-line="6" selection-start-column="31" selection-end-line="6" selection-end-column="31" />
+            <state vertical-scroll-proportion="-23.333334" vertical-offset="54" max-vertical-offset="1620">
+              <caret line="38" column="72" selection-start-line="38" selection-start-column="72" selection-end-line="38" selection-end-column="72" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="index.blade.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/views/index.blade.php">
+      <file leaf-file-name="film.blade.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/views/film.blade.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="20.42623" vertical-offset="1444" max-vertical-offset="2250">
-              <caret line="11" column="65" selection-start-line="11" selection-start-column="65" selection-end-line="11" selection-end-column="65" />
+            <state vertical-scroll-proportion="-110.666664" vertical-offset="0" max-vertical-offset="4734">
+              <caret line="166" column="25" selection-start-line="166" selection-start-column="25" selection-end-line="166" selection-end-column="25" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="hello.blade.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/views/hello.blade.php">
+      <file leaf-file-name="bootstrap-paper.min.css" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/public/css/bootstrap-paper.min.css">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-4.0" vertical-offset="0" max-vertical-offset="1620">
-              <caret line="6" column="47" selection-start-line="6" selection-start-column="47" selection-end-line="6" selection-end-column="47" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="14484" max-vertical-offset="15462">
+              <caret line="6" column="135044" selection-start-line="6" selection-start-column="135044" selection-end-line="6" selection-end-column="135044" />
+              <folding>
+                <element signature="e#126761#127036#2" expanded="true" />
+                <element signature="e#127570#127845#2" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="suggest.blade.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/views/suggest.blade.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="-17.333334" vertical-offset="54" max-vertical-offset="1242">
+              <caret line="29" column="59" selection-start-line="29" selection-start-column="59" selection-end-line="29" selection-end-column="59" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="bootstrap.css" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/public/css/bootstrap.css">
+      <file leaf-file-name="settings.blade.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/views/settings.blade.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="134046">
-              <caret line="0" column="82" selection-start-line="0" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
+            <state vertical-scroll-proportion="-11.333333" vertical-offset="180" max-vertical-offset="2124">
+              <caret line="27" column="94" selection-start-line="27" selection-start-column="94" selection-end-line="27" selection-end-column="94" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="bootstrap-my.min.css" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/public/css/bootstrap-my.min.css">
+      <file leaf-file-name="routes.php" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/app/routes.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.020454545" vertical-offset="0" max-vertical-offset="24966">
-              <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
+            <state vertical-scroll-proportion="0.1425206" vertical-offset="3749" max-vertical-offset="8244">
+              <caret line="224" column="73" selection-start-line="224" selection-start-column="73" selection-end-line="224" selection-end-column="73" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="bootstrap-superhero.min.css" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/public/css/bootstrap-superhero.min.css">
+      <file leaf-file-name="Film.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/models/Film.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="24410" max-vertical-offset="25362">
-              <caret line="6" column="117686" selection-start-line="6" selection-start-column="117686" selection-end-line="6" selection-end-column="117686" />
+            <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="558">
+              <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="bootstrap-flatly.min.css" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/public/css/bootstrap-flatly.min.css">
+      <file leaf-file-name="User.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/models/User.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="24644" max-vertical-offset="25596">
-              <caret line="6" column="118892" selection-start-line="6" selection-start-column="118892" selection-end-line="6" selection-end-column="118892" />
+            <state vertical-scroll-proportion="-18.407408" vertical-offset="457" max-vertical-offset="1764">
+              <caret line="54" column="51" selection-start-line="54" selection-start-column="51" selection-end-line="54" selection-end-column="51" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="suggest.blade.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/views/suggest.blade.php">
+      <file leaf-file-name="bootstrap-sandstone.min.css" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/public/css/bootstrap-sandstone.min.css">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-4.9259257" vertical-offset="389" max-vertical-offset="1296">
-              <caret line="29" column="57" selection-start-line="29" selection-start-column="57" selection-end-line="29" selection-end-column="57" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="19546" max-vertical-offset="20448">
+              <caret line="6" column="120558" selection-start-line="6" selection-start-column="120558" selection-end-line="6" selection-end-column="120558" />
               <folding />
             </state>
           </provider>
@@ -137,29 +165,69 @@
         <option value="$PROJECT_DIR$/app/config/queue.php" />
         <option value="$PROJECT_DIR$/app/config/view.php" />
         <option value="$PROJECT_DIR$/artisan" />
-        <option value="$PROJECT_DIR$/app/views/film.blade.php" />
         <option value="$PROJECT_DIR$/app/models/Comment.php" />
-        <option value="$PROJECT_DIR$/app/views/index.blade.php" />
-        <option value="$PROJECT_DIR$/app/views/suggest.blade.php" />
         <option value="$PROJECT_DIR$/public/css/bootstrap-flatly.min.css" />
         <option value="$PROJECT_DIR$/public/css/bootstrap-superhero.min.css" />
         <option value="$PROJECT_DIR$/public/css/bootstrap-cyborg.min.css" />
         <option value="$PROJECT_DIR$/public/css/bootstrap-magic.css" />
+        <option value="$PROJECT_DIR$/public/css/bootstrap-my.min.css" />
+        <option value="$PROJECT_DIR$/public/css/bootstrap.min.css" />
+        <option value="$PROJECT_DIR$/public/css/bootstrap-readable.min.css" />
+        <option value="$PROJECT_DIR$/public/css/bootstrap-sandstone.min.css" />
+        <option value="$PROJECT_DIR$/app/views/index.blade.php" />
+        <option value="$PROJECT_DIR$/app/views/suggest.blade.php" />
+        <option value="$PROJECT_DIR$/app/views/settings.blade.php" />
+        <option value="$PROJECT_DIR$/app/models/User.php" />
+        <option value="$PROJECT_DIR$/public/css/boostrap-paper.min.css" />
+        <option value="$PROJECT_DIR$/app/views/film.blade.php" />
         <option value="$PROJECT_DIR$/app/views/hello.blade.php" />
         <option value="$PROJECT_DIR$/app/routes.php" />
-        <option value="$PROJECT_DIR$/public/css/bootstrap-my.min.css" />
       </list>
     </option>
   </component>
   <component name="JsGulpfileManager">
     <detection-done>true</detection-done>
   </component>
-  <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
+  <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true">
+    <include_path>
+      <path value="$PROJECT_DIR$/vendor/doctrine/lexer" />
+      <path value="$PROJECT_DIR$/vendor/nikic/php-parser" />
+      <path value="$PROJECT_DIR$/vendor/patchwork/utf8" />
+      <path value="$PROJECT_DIR$/vendor/monolog/monolog" />
+      <path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/collections" />
+      <path value="$PROJECT_DIR$/vendor/symfony/dom-crawler" />
+      <path value="$PROJECT_DIR$/vendor/symfony/http-kernel" />
+      <path value="$PROJECT_DIR$/vendor/symfony/process" />
+      <path value="$PROJECT_DIR$/vendor/symfony/translation" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/dbal" />
+      <path value="$PROJECT_DIR$/vendor/symfony/filesystem" />
+      <path value="$PROJECT_DIR$/vendor/symfony/http-foundation" />
+      <path value="$PROJECT_DIR$/vendor/symfony/console" />
+      <path value="$PROJECT_DIR$/vendor/symfony/browser-kit" />
+      <path value="$PROJECT_DIR$/vendor/symfony/routing" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/cache" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/common" />
+      <path value="$PROJECT_DIR$/vendor/symfony/finder" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/annotations" />
+      <path value="$PROJECT_DIR$/vendor/symfony/debug" />
+      <path value="$PROJECT_DIR$/vendor/doctrine/inflector" />
+      <path value="$PROJECT_DIR$/vendor/laravel/framework" />
+      <path value="$PROJECT_DIR$/vendor/symfony/css-selector" />
+      <path value="$PROJECT_DIR$/vendor/classpreloader/classpreloader" />
+      <path value="$PROJECT_DIR$/vendor/psr/log" />
+      <path value="$PROJECT_DIR$/vendor/swiftmailer/swiftmailer" />
+      <path value="$PROJECT_DIR$/vendor/predis/predis" />
+      <path value="$PROJECT_DIR$/vendor/nesbot/carbon" />
+      <path value="$PROJECT_DIR$/vendor/filp/whoops" />
+      <path value="$PROJECT_DIR$/vendor/composer" />
+      <path value="$PROJECT_DIR$/vendor/ircmaxell/password-compat" />
+    </include_path>
+  </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="671" />
-    <option name="y" value="30" />
-    <option name="width" value="1239" />
-    <option name="height" value="1046" />
+    <option name="x" value="-1" />
+    <option name="width" value="1922" />
+    <option name="height" value="1055" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
@@ -216,24 +284,6 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dumbo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dumbo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="public" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="js" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="dumbo" />
@@ -302,24 +352,6 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dumbo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dumbo" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="app" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="config" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
         </subPane>
       </pane>
       <pane id="Scope" />
@@ -328,6 +360,8 @@
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="list.type.of.created.stylesheet" value="CSS" />
+    <property name="LayoutCode.rearrangeEntriesBlade" value="false" />
+    <property name="FullScreen" value="false" />
   </component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
@@ -353,6 +387,7 @@
       <node-options />
       <gulpfile />
       <tasks />
+      <arguments />
       <pass-parent-envs>true</pass-parent-envs>
       <envs />
       <method />
@@ -363,6 +398,9 @@
     <list size="0" />
   </component>
   <component name="ShelveChangesManager" show_recycled="false" />
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
       <changelist id="80f2fc29-4939-4e5d-80a5-cd8ec589ca07" name="Default" comment="" />
@@ -370,11 +408,18 @@
       <option name="number" value="Default" />
       <updated>1416926780819</updated>
     </task>
+    <task id="LOCAL-00001" summary="Winter style">
+      <created>1417707403055</created>
+      <option name="number" value="00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1417707403055</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="671" y="30" width="1239" height="1046" extended-state="0" />
-    <editor active="false" />
+    <frame x="-1" y="0" width="1922" height="1055" extended-state="6" />
+    <editor active="true" />
     <layout>
       <window_info id="Changes" 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" />
       <window_info id="Terminal" 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" />
@@ -382,7 +427,7 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" 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" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24768324" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.19423692" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" 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" />
@@ -397,6 +442,28 @@
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
     </layout>
+    <layout-to-restore>
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Changes" 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" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="9" side_tool="true" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+      <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="11" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25551602" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+    </layout-to-restore>
   </component>
   <component name="Vcs.Log.UiProperties">
     <option name="RECENTLY_FILTERED_USER_GROUPS">
@@ -421,11 +488,94 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/app/routes.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="540" max-vertical-offset="7434">
+          <caret line="39" column="23" selection-start-line="39" selection-start-column="23" selection-end-line="39" selection-end-column="23" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/views/settings.blade.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1620">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/routes.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="540" max-vertical-offset="7434">
+          <caret line="39" column="23" selection-start-line="39" selection-start-column="23" selection-end-line="39" selection-end-column="23" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/public/.htaccess">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="108" max-vertical-offset="234">
+          <caret line="6" column="31" selection-start-line="6" selection-start-column="31" selection-end-line="6" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/views/index.blade.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="198" max-vertical-offset="2088">
+          <caret line="11" column="65" selection-start-line="11" selection-start-column="65" selection-end-line="11" selection-end-column="65" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/views/hello.blade.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="108" max-vertical-offset="1584">
+          <caret line="6" column="47" selection-start-line="6" selection-start-column="47" selection-end-line="6" selection-end-column="47" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/public/css/bootstrap.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="132858">
+          <caret line="0" column="82" selection-start-line="0" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/public/css/bootstrap-my.min.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="100">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/public/css/bootstrap-superhero.min.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="108" max-vertical-offset="216">
+          <caret line="6" column="117686" selection-start-line="6" selection-start-column="117686" selection-end-line="6" selection-end-column="117686" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/public/css/bootstrap-flatly.min.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="108" max-vertical-offset="216">
+          <caret line="6" column="118892" selection-start-line="6" selection-start-column="118892" selection-end-line="6" selection-end-column="118892" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/views/suggest.blade.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="522" max-vertical-offset="1224">
+          <caret line="29" column="57" selection-start-line="29" selection-start-column="57" selection-end-line="29" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/app/views/film.blade.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="2232" max-vertical-offset="4644">
           <caret line="124" column="6" selection-start-line="124" selection-start-column="6" selection-end-line="124" selection-end-column="6" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -441,7 +591,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="396">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -449,7 +598,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="234" max-vertical-offset="2088">
           <caret line="13" column="127" selection-start-line="13" selection-start-column="127" selection-end-line="13" selection-end-column="127" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -457,7 +605,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="414" max-vertical-offset="1584">
           <caret line="23" column="62" selection-start-line="23" selection-start-column="24" selection-end-line="23" selection-end-column="62" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -465,7 +612,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="468" max-vertical-offset="1224">
           <caret line="26" column="38" selection-start-line="26" selection-start-column="38" selection-end-line="26" selection-end-column="38" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -480,9 +626,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.8862837" vertical-offset="0" max-vertical-offset="864">
           <caret line="42" column="12" selection-start-line="42" selection-start-column="12" selection-end-line="42" selection-end-column="12" />
-          <folding>
-            <element signature="e#6#135#0#PHP" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -525,16 +668,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.27198124" vertical-offset="272" max-vertical-offset="1422">
           <caret line="28" column="0" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="0" />
-          <folding>
-            <element signature="e#26#481#0#PHP" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/pagination.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.16881594" vertical-offset="0" max-vertical-offset="853">
-          <caret line="8" column="15" selection-start-line="8" selection-start-column="15" selection-end-line="8" selection-end-column="15" />
         </state>
       </provider>
     </entry>
@@ -557,126 +690,189 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-10.666667" vertical-offset="0" max-vertical-offset="396">
           <caret line="16" column="1" selection-start-line="16" selection-start-column="1" selection-end-line="16" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/public/css/bootstrap-theme.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-7.509091" vertical-offset="6608" max-vertical-offset="7488">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/public/css/general.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="900">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/public/css/bootstrap-magic.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.020454545" vertical-offset="0" max-vertical-offset="104940">
+          <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/film.blade.php">
+    <entry file="file://$PROJECT_DIR$/public/css/bootstrap-cyborg.min.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-74.666664" vertical-offset="234" max-vertical-offset="5238">
-          <caret line="125" column="32" selection-start-line="125" selection-start-column="32" selection-end-line="125" selection-end-column="32" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="25218">
+          <caret line="6" column="116883" selection-start-line="6" selection-start-column="116883" selection-end-line="6" selection-end-column="116883" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/suggest.blade.php">
+    <entry file="file://$PROJECT_DIR$/public/css/bootstrap-my.min.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-4.9259257" vertical-offset="389" max-vertical-offset="1296">
-          <caret line="29" column="57" selection-start-line="29" selection-start-column="57" selection-end-line="29" selection-end-column="57" />
+        <state vertical-scroll-proportion="0.025974026" vertical-offset="0" max-vertical-offset="21078">
+          <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/public/css/bootstrap-theme.css">
+    <entry file="file://$PROJECT_DIR$/public/css/bootstrap.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.509091" vertical-offset="6608" max-vertical-offset="7488">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="134046">
+          <caret line="0" column="82" selection-start-line="0" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/public/css/general.css">
+    <entry file="file://$PROJECT_DIR$/public/css/bootstrap-superhero.min.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="900">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state vertical-scroll-proportion="30.597403" vertical-offset="0" max-vertical-offset="21312">
+          <caret line="6" column="117686" selection-start-line="6" selection-start-column="117686" selection-end-line="6" selection-end-column="117686" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/public/css/bootstrap-flatly.min.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="24644" max-vertical-offset="25596">
+        <state vertical-scroll-proportion="30.83117" vertical-offset="0" max-vertical-offset="21474">
           <caret line="6" column="118892" selection-start-line="6" selection-start-column="118892" selection-end-line="6" selection-end-column="118892" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/public/css/bootstrap-superhero.min.css">
+    <entry file="file://$PROJECT_DIR$/public/.htaccess">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="24410" max-vertical-offset="25362">
-          <caret line="6" column="117686" selection-start-line="6" selection-start-column="117686" selection-end-line="6" selection-end-column="117686" />
-          <folding />
+        <state vertical-scroll-proportion="0.15584415" vertical-offset="0" max-vertical-offset="693">
+          <caret line="6" column="31" selection-start-line="6" selection-start-column="31" selection-end-line="6" selection-end-column="31" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/public/css/bootstrap.min.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="21132">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.3323217" vertical-offset="7269" max-vertical-offset="17568">
+          <caret line="8" column="41235" selection-start-line="8" selection-start-column="41235" selection-end-line="8" selection-end-column="41235" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/public/css/bootstrap-magic.css">
+    <entry file="file://$PROJECT_DIR$/public/css/bootstrap-sandstone.min.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.020454545" vertical-offset="0" max-vertical-offset="104940">
-          <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="19546" max-vertical-offset="20448">
+          <caret line="6" column="120558" selection-start-line="6" selection-start-column="120558" selection-end-line="6" selection-end-column="120558" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/public/css/bootstrap-cyborg.min.css">
+    <entry file="file://$PROJECT_DIR$/app/views/index.blade.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="25218">
-          <caret line="6" column="116883" selection-start-line="6" selection-start-column="116883" selection-end-line="6" selection-end-column="116883" />
+        <state vertical-scroll-proportion="0.2241594" vertical-offset="18" max-vertical-offset="2196">
+          <caret line="11" column="67" selection-start-line="11" selection-start-column="67" selection-end-line="11" selection-end-column="67" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/views/pagination.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.17932752" vertical-offset="0" max-vertical-offset="803">
+          <caret line="8" column="15" selection-start-line="8" selection-start-column="15" selection-end-line="8" selection-end-column="15" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/vendor/laravel/framework/src/Illuminate/Support/helpers.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.34371108" vertical-offset="11586" max-vertical-offset="16938">
+          <caret line="659" column="13" selection-start-line="659" selection-start-column="13" selection-end-line="659" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/models/User.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-18.407408" vertical-offset="457" max-vertical-offset="1764">
+          <caret line="54" column="51" selection-start-line="54" selection-start-column="51" selection-end-line="54" selection-end-column="51" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/public/css/bootstrap-readable.min.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="19492" max-vertical-offset="20394">
+          <caret line="6" column="120273" selection-start-line="6" selection-start-column="120273" selection-end-line="6" selection-end-column="120273" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/app/views/hello.blade.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-4.0" vertical-offset="0" max-vertical-offset="1620">
-          <caret line="6" column="47" selection-start-line="6" selection-start-column="47" selection-end-line="6" selection-end-column="47" />
+        <state vertical-scroll-proportion="-23.333334" vertical-offset="54" max-vertical-offset="1620">
+          <caret line="38" column="72" selection-start-line="38" selection-start-column="72" selection-end-line="38" selection-end-column="72" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/views/index.blade.php">
+    <entry file="file://$PROJECT_DIR$/app/models/Film.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="20.42623" vertical-offset="1444" max-vertical-offset="2250">
-          <caret line="11" column="65" selection-start-line="11" selection-start-column="65" selection-end-line="11" selection-end-column="65" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="906">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/public/.htaccess">
+    <entry file="file://$PROJECT_DIR$/app/views/settings.blade.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="234">
-          <caret line="6" column="31" selection-start-line="6" selection-start-column="31" selection-end-line="6" selection-end-column="31" />
+        <state vertical-scroll-proportion="-11.333333" vertical-offset="180" max-vertical-offset="2124">
+          <caret line="27" column="94" selection-start-line="27" selection-start-column="94" selection-end-line="27" selection-end-column="94" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/routes.php">
+    <entry file="file://$PROJECT_DIR$/public/css/bootstrap-paper.min.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-20.0" vertical-offset="0" max-vertical-offset="7542">
-          <caret line="39" column="23" selection-start-line="39" selection-start-column="23" selection-end-line="39" selection-end-column="23" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="14484" max-vertical-offset="15462">
+          <caret line="6" column="135044" selection-start-line="6" selection-start-column="135044" selection-end-line="6" selection-end-column="135044" />
+          <folding>
+            <element signature="e#126761#127036#2" expanded="true" />
+            <element signature="e#127570#127845#2" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/views/suggest.blade.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-17.333334" vertical-offset="54" max-vertical-offset="1260">
+          <caret line="29" column="59" selection-start-line="29" selection-start-column="59" selection-end-line="29" selection-end-column="59" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/public/css/bootstrap.css">
+    <entry file="file://$PROJECT_DIR$/app/views/film.blade.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="134046">
-          <caret line="0" column="82" selection-start-line="0" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
+        <state vertical-scroll-proportion="-110.666664" vertical-offset="0" max-vertical-offset="4734">
+          <caret line="166" column="25" selection-start-line="166" selection-start-column="25" selection-end-line="166" selection-end-column="25" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/public/css/bootstrap-my.min.css">
+    <entry file="file://$PROJECT_DIR$/app/routes.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.020454545" vertical-offset="0" max-vertical-offset="24966">
-          <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.1425206" vertical-offset="3749" max-vertical-offset="8244">
+          <caret line="224" column="73" selection-start-line="224" selection-start-column="73" selection-end-line="224" selection-end-column="73" />
           <folding />
         </state>
       </provider>

app/models/User.php

@@ -51,6 +51,30 @@ class User extends Eloquent implements UserInterface, RemindableInterface {
 		return $this->email;
 	}
 
+    public function getAvatar() {
+        if($avatar = $this->getSetting('avatar')) {
+            return asset('img/avatars/'.$avatar);
+        } else {
+            return asset('img/no-avatar.jpg');
+        }
+    }
+
+    public function getSetting($key, $false = false) {
+        $settings = json_decode($this->settings);
+        if(!is_null($settings))
+            return $settings->$key;
+        else
+            return $false;
+    }
+
+    public function setSetting($key, $value) {
+        $settings = json_decode($this->settings);
+        if(!is_null($settings)) {
+            $settings = array();
+        }
+        $settings[$key] = $value;
+        $this->settings = json_encode($settings);
+    }
 
 	public function films() {
 		return $this->hasMany('Film', 'user');

app/routes.php

@@ -220,15 +220,22 @@ Route::post('neu', array('before' => 'auth', function() {
 }));
 
 Route::get('vorschlag/{id}', array('before' => 'auth', function($id) {
-	$tmdb = new TMDb('b187f8d9c5e72b1faecb741d5d04239a', 'de', TRUE);
-	$f = $tmdb->getMovie($id);
-	$film = new Film();
-	$film ->name = $f['title'];
-	$film->tvdbid = $id;
-	$film->vorgeschlagen = \Carbon\Carbon::today();
-	$film->user = Auth::user()->id;
-	$film->save();
-	return Redirect::to('film/' . $film->id);
+    $ef = Film::where('tvdbid', '=', $id)->whereNull('gesehen')->first();
+    if(is_null($ef)) {
+        $tmdb = new TMDb('b187f8d9c5e72b1faecb741d5d04239a', 'de', TRUE);
+        $f = $tmdb->getMovie($id);
+        $film = new Film();
+        $film->name = $f['title'];
+        $film->tvdbid = $id;
+        $film->vorgeschlagen = \Carbon\Carbon::today();
+        $film->user = Auth::user()->id;
+        $film->save();
+        Session::put('message', 'Film hinzugefügt.');
+        return Redirect::to('film/' . $film->id);
+    } else {
+        Session::put('message', 'Film bereits vorgeschlagen von ' . $ef->besitzer->name . '.');
+        return Redirect::to('film/' . $ef->id);
+    }
 }));
 
 Route::get('mark-read/{id}', array('before' => 'auth', function($id) {
@@ -320,6 +327,44 @@ Route::post('settings/{mode}', array('before' => 'auth', function($mode) {
 			return View::make('settings')->with('errors', $val->messages());	
 		}
 	}
+
+    if($mode == 'avatar-reset') {
+        /** @var User $u */
+        $u = Auth::user();
+        $u->setSetting('avatar', false);
+        $u->save();
+
+        /* Delete old Avatars */
+        array_map('unlink', glob(public_path("img/avatars/". Auth::user()->id . "-*")));
+        return View::make('settings')->with('message', 'Avatar gelöscht.');
+    }
+
+    if($mode == 'avatar-upload') {
+        $vfields = array('avatar' => Input::file('avatar'));
+        $vrules = array('avatar' => 'required|image|max:5000');
+        $val = Validator::make($vfields, $vrules);
+        if($val->passes()) {
+            /* Delete old Avatars */
+            array_map('unlink', glob(public_path("img/avatars/". Auth::user()->id . "-*")));
+
+            /** @var Symfony\Component\HttpFoundation\File\UploadedFile $file */
+            $file = Input::file('avatar');
+            $file = $file->move( public_path("img/avatars/"), Auth::user()->id . "-". Str::slug($file->getFilename()) . "." . $file->guessExtension() );
+
+            $i = new Imagick();
+            $i->readImage($file->getRealPath());
+            $i->cropThumbnailImage(100, 100);
+            $i->writeImage();
+
+            /** @var User $u */
+            $u = Auth::user();
+            $u->setSetting('avatar', $file->getFilename());
+            $u->save();
+            return View::make('settings')->with('message', 'Avatar gespeichert.');
+        } else {
+            return View::make('settings')->with('errors', $val->messages());
+        }
+    }
 }));
 
 Route::get('users', array('before' => 'auth', function() {

app/views/film.blade.php

@@ -144,7 +144,7 @@
 @else
 <div class="media">
 	<div class="pull-left">
-		<img class="media-object" src="{{ "http://www.gravatar.com/avatar/" . md5( strtolower( trim( Auth::user()->email ) ) ) . "?s=40" }}">
+		<img class="media-object" src="{{ Auth::user()->getAvatar() }}" width="64">
 	</div>
 	<div class="media-body">
 		<h4 class="media-heading">Neuer Kommentar</h4>
@@ -173,7 +173,7 @@
 
 <div class="media">
 	<div class="pull-left">
-		<img class="media-object" src="{{ "http://www.gravatar.com/avatar/" . md5( strtolower( trim( $comment->autor->email ) ) ) . "?s=40" }}" alt="{{ $comment->autor->name }}">
+		<img class="media-object" src="{{ $comment->autor->getAvatar() }}" alt="{{ $comment->autor->name }}" width="64">
 	</div>
 	<div class="media-body" id="comment{{$comment->id}}">
 		<h5 class="media-heading">{{ $comment->autor->name }} <small>{{\Carbon\Carbon::parse($comment->created_at)->format('d.m.Y H:i')}}

app/views/hello.blade.php

@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>@yield('title') Dumbo</title>
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
-	<link href="{{ asset('css/bootstrap-my.min.css') }}" type="text/css" rel="stylesheet">
+	<link href="{{ asset('css/bootstrap.css') }}" type="text/css" rel="stylesheet">
 	<link href="{{ asset('css/general.css') }}" type="text/css" rel="stylesheet">
 	@yield('styles')
 </head>
@@ -21,8 +21,8 @@
 			</div>     
 		    <div class="navbar-collapse collapse">
 				<ul class="nav navbar-nav">
-					<li>{{ HTML::link('beliebt', 'Beliebt') }}</li>
-					<li>{{ HTML::link('vorgeschlagen', 'Vorgeschlagen') }}</li>
+					<li>{{ HTML::link('beliebt', 'Beliebt (Wertung)') }}</li>
+					<li>{{ HTML::link('vorgeschlagen', 'Vorgeschlagen (Datum)') }}</li>
 					<li>{{ HTML::link('gesehen', 'Gesehen') }}</li>
 					<li>{{ HTML::link('neu', 'Film vorschlagen')}}
 				</ul>
@@ -32,9 +32,11 @@
 					<li>{{ HTML::link('login', 'Login') }}</li>
 					@else
 					<li class="dropdown">
-						<a class="dropdown-toggle" data-toggle="dropdown" href="#">{{Auth::user()->name}} <span class="caret"></span></a>
+						<a class="dropdown-toggle" data-toggle="dropdown" href="#">
+                            <img src="{{ Auth::user()->getAvatar() }}" height="25" }}>
+                            {{Auth::user()->name}} <span class="caret"></span></a>
 						<ul class="dropdown-menu">
-							<li>{{ HTML::link('settings', 'Passwort &amp; Email &auml;ndern')}}</li>
+							<li>{{ HTML::link('settings', 'Einstellungen')}}</li>
 							@if(Auth::user()->admin)
 							<li>{{ HTML::link('users', 'Benutzerverwaltung')}}</li>
 							<li>{{ HTML::link('news', 'News erstellen')}}</li>
@@ -60,7 +62,7 @@
 <div class="container">
 	<div class="alert alert-success alert-dismissable">
 	  <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-	  {{ Session::get('message') }}
+	  {{ Session::get('message') }} <?php Session::forget('message'); ?>
 	</div>
 </div>
 @endif

app/views/index.blade.php

@@ -9,7 +9,7 @@
 				<img src="{{$image}}" class="pull-left thumbnail" style="max-height: 100px; margin-right: 15px;">
 				<h4>{{$topfilm->name}}</h4>
 				<p><span class="glyphicon glyphicon-thumbs-up"></span>&nbsp;{{$topfilm->upvotes}}
-					<span class="glyphicon glyphicon-tree-conifer"></span>&nbsp;{{$topfilm->downvotes + $topfilm->upvotes}}</p>
+					<span class="glyphicon glyphicon-tree-deciduous"></span>&nbsp;{{$topfilm->downvotes + $topfilm->upvotes}}</p>
 				@if(!is_null(Auth::user()) && Auth::user()->admin)
 					<a href='{{ url('view-next/' . $topfilm->id) }}' class='btn btn-success btn-xs'>Als n&auml;chstes sehen</a>
 				@endif

app/views/settings.blade.php

@@ -1,76 +1,112 @@
 @extends('hello')
 
 @section('content')
-<div class="container" style="margin-top: 40px;">
-	<div class="row">
-		<div class="col-md-8 col-md-offset-2">
-			<div class="panel panel-default">
-				<div class="panel-heading"><h2 class="panel-title">Passwort ändern</h2></div>
-				<div class="panel-body">
-					{{ Form::open(array('url' => 'settings/password')) }}
-						{{ $errors->first() }}
-						<div class="input-group form-group <?php if($errors->has('oldpw')) echo "has-error" ?>">
+    <div class="container" style="margin-top: 40px;">
+        <div class="row">
+            <div class="col-md-2">
+                <ul class="nav nav-pills nav-stacked">
+                    <li class="active"><a href="#avatar" data-toggle="pill">Avatar</a></li>
+                    <li><a href="#password" data-toggle="pill">Password</a></li>
+                    <li><a href="#email" data-toggle="pill">E-Mail</a></li>
+                </ul>
+            </div>
+            <div class="col-md-8 tab-content">
+                <div class="tab-pane active" id="avatar">
+                    <div class="panel panel-default">
+                        <div class="panel-heading">
+                            <h2 class="panel-title">Avatar</h2>
+                        </div>
+                        <div class="panel-body">
+                            <div class="media media-left">
+                                <a href="#"><img class="media-object" src="{{ Auth::user()->getAvatar() }}" width="64"></a>
+                            </div>
+                            <div class="media-body">
+                                <h4 class="media-heading">Aktueller Avatar</h4>
+                                Du kannst unten einen neuen Avatar hochladen oder den Avatar zurücksetzen.
+                            </div>
+                            <p>
+                                {{ Form::open(array('url' => 'settings/avatar-upload', 'files' => true)) }}
+                                {{ $errors->first() }}
+                                {{ Form::file('avatar'); }}
+                                    <button type="submit" class="btn btn-primary">Absenden</button>
+                                {{ Form::close() }}
+                            </p>
+                            <p>
+                                {{ Form::open(array('url' => 'settings/avatar-reset')) }}
+                                <button type="submit" class="btn btn-danger">Avatar zurücksetzen</button>
+                                {{ Form::close() }}
+                            </p>
+                        </div>
+                    </div>
+                </div>
+                <div class="tab-pane" id="password">
+                    <div class="panel panel-default">
+                        <div class="panel-heading"><h2 class="panel-title">Passwort ändern</h2></div>
+                        <div class="panel-body">
+                            {{ Form::open(array('url' => 'settings/password')) }}
+                            {{ $errors->first() }}
+                            <div class="input-group form-group <?php if ($errors->has('oldpw')) echo "has-error" ?>">
 							<span class="input-group-addon">
 								<span class="glyphicon glyphicon-lock"></span>
 							</span>
-							<input type="password" class="form-control" name="oldpw" placeholder="Altes Passwort">
-						</div>
-						<div class="input-group form-group <?php if($errors->has('newpw')) echo "has-error" ?>">
+                                <input type="password" class="form-control" name="oldpw" placeholder="Altes Passwort">
+                            </div>
+                            <div class="input-group form-group <?php if ($errors->has('newpw')) echo "has-error" ?>">
 							<span class="input-group-addon">
 								<span class="glyphicon glyphicon-lock"></span>
 							</span>
-							<input type="password" class="form-control" name="newpw" placeholder="Neues Passwort">
-						</div>
-						<div class="input-group form-group <?php if($errors->has('newpw')) echo "has-error" ?>">
+                                <input type="password" class="form-control" name="newpw" placeholder="Neues Passwort">
+                            </div>
+                            <div class="input-group form-group <?php if ($errors->has('newpw')) echo "has-error" ?>">
 							<span class="input-group-addon">
 								<span class="glyphicon glyphicon-lock"></span>
 							</span>
-							<input type="password" class="form-control" name="newpw2" placeholder="Neues Passwort bestätigen">
-						</div>
-						<button type="submit" class="btn btn-primary">Absenden</button>
-					{{ Form::close() }}
-				</div>
-			</div>
-		</div>
-	</div>
-
-	<div class="row">
-		<div class="col-md-8 col-md-offset-2">
-			<div class="panel panel-default">
-				<div class="panel-heading"><h2 class="panel-title">Email ändern</h2></div>
-				<div class="panel-body">
-					<dl class="dl-horizontal">
-						<dt>Aktuelle Email</dt>
-						<dd>{{Auth::user()->email}}</dd>
-					</dl>
-					{{ Form::open(array('url' => 'settings/email')) }}
-						<div class="input-group form-group <?php if($errors->has('pw')) echo "has-error" ?>">
+                                <input type="password" class="form-control" name="newpw2"
+                                       placeholder="Neues Passwort bestätigen">
+                            </div>
+                            <button type="submit" class="btn btn-primary">Absenden</button>
+                            {{ Form::close() }}
+                        </div>
+                    </div>
+                </div>
+                <div class="tab-pane" id="email">
+                    <div class="panel panel-default">
+                        <div class="panel-heading"><h2 class="panel-title">E-Mail ändern</h2></div>
+                        <div class="panel-body">
+                            <dl class="dl-horizontal">
+                                <dt>Aktuelle E-Mail</dt>
+                                <dd>{{Auth::user()->email}}</dd>
+                            </dl>
+                            {{ Form::open(array('url' => 'settings/email')) }}
+                            <div class="input-group form-group <?php if ($errors->has('pw')) echo "has-error" ?>">
 							<span class="input-group-addon">
 								<span class="glyphicon glyphicon-lock"></span>
 							</span>
-							<input type="password" class="form-control" name="pw" placeholder="Passwort">
-						</div>
-						<div class="input-group form-group <?php if($errors->has('email')) echo "has-error" ?>">
+                                <input type="password" class="form-control" name="pw" placeholder="Passwort">
+                            </div>
+                            <div class="input-group form-group <?php if ($errors->has('email')) echo "has-error" ?>">
 							<span class="input-group-addon">
 								<span class="glyphicon glyphicon-envelope"></span>
 							</span>
-							<input type="email" class="form-control" name="email" placeholder="Neue Email">
-						</div>
-						<div class="input-group form-group <?php if($errors->has('email')) echo "has-error" ?>">
+                                <input type="email" class="form-control" name="email" placeholder="Neue E-Mail">
+                            </div>
+                            <div class="input-group form-group <?php if ($errors->has('email')) echo "has-error" ?>">
 							<span class="input-group-addon">
 								<span class="glyphicon glyphicon-envelope"></span>
 							</span>
-							<input type="email" class="form-control" name="email2" placeholder="Neue Email bestätigen">
-						</div>
-						<button type="submit" class="btn btn-primary">Absenden</button>
-					{{ Form::close() }}
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
+                                <input type="email" class="form-control" name="email2"
+                                       placeholder="Neue E-Mail bestätigen">
+                            </div>
+                            <button type="submit" class="btn btn-primary">Absenden</button>
+                            {{ Form::close() }}
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
 @stop
 
 @section('title')
-Einstellungen ~
+    Einstellungen ~
 @stop

app/views/suggest.blade.php

@@ -27,7 +27,7 @@
 				$vp = $film->upvotes; 
 				$np = $film->downvotes;
 				?>
-			<span class="glyphicon glyphicon-tree-conifer"></span>&nbsp;{{ $vp + $np }}
+			<span class="glyphicon glyphicon-tree-deciduous"></span>&nbsp;{{ $vp + $np }}
 		</td>
 		<td>
 			@if(($vp) > 0) 		<span class="label label-default">+{{$vp}}</span>