daniel/dumbo
Archived
1
0 Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Sommer Style, Avatare, Duplikate

Browse Source
This commit is contained in:
daniel committed 2015-10-21 07:02:29 +02:00
1 parent 62d4c32d53
commit 0de0eefa37
10 files changed
+475 -392
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.idea/workspace.xml
Generated
+282 -273
View File
@@ -1,22 +1,16 @@
<?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="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" />
<list default="true" id="80f2fc29-4939-4e5d-80a5-cd8ec589ca07" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/models/Film.php" afterPath="$PROJECT_DIR$/app/models/Film.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/css/bootstrap-superhero.min.css" afterPath="$PROJECT_DIR$/public/css/bootstrap-superhero.min.css" />
<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/seen.blade.php" afterPath="$PROJECT_DIR$/app/views/seen.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$/app/views/users.blade.php" afterPath="$PROJECT_DIR$/app/views/users.blade.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list>
<ignored path="dumbo.iws" />
@@ -37,31 +31,33 @@
<component name="CreatePatchCommitExecutor">
<option name="PATCH_PATH" value="" />
</component>
<component name="DaemonCodeAnalyzer">
<disable_hints />
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FavoritesManager">
<favorites_list name="dumbo" />
</component>
<component name="FileEditorManager">
<leaf>
<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">
<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="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" />
<state vertical-scroll-proportion="-4.576271">
<caret line="15" column="67" selection-start-line="15" selection-start-column="67" selection-end-line="15" selection-end-column="67" />
<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="index.blade.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/views/index.blade.php">
<provider selected="true" editor-type-id="text-editor">
<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 vertical-scroll-proportion="-6.377049">
<caret line="54" column="38" selection-start-line="53" selection-start-column="120" selection-end-line="55" selection-end-column="27" />
<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#5206#5252#0#HTML" expanded="true" />
</folding>
</state>
</provider>
</entry>
@@ -69,22 +65,47 @@
<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="-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" />
<state vertical-scroll-proportion="-7.322034">
<caret line="78" column="276" selection-start-line="78" selection-start-column="276" selection-end-line="78" selection-end-column="276" />
<folding>
<element signature="e#2694#2718#0#HTML" expanded="true" />
<element signature="e#2838#2881#0#HTML" expanded="true" />
<element signature="e#4487#4513#0#HTML" expanded="true" />
<element signature="e#5611#5636#0#HTML" expanded="true" />
<element signature="e#7160#7186#0#HTML" expanded="true" />
<element signature="e#7565#7590#0#HTML" expanded="true" />
<element signature="e#8470#8496#0#HTML" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="seen.blade.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/views/seen.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.6240209">
<caret line="31" column="7" selection-start-line="31" selection-start-column="7" selection-end-line="31" selection-end-column="7" />
<folding />
</state>
</provider>
</entry>
</file>
<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">
<file leaf-file-name="users.blade.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/views/users.blade.php">
<provider selected="true" editor-type-id="text-editor">
<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 vertical-scroll-proportion="-5.4915257">
<caret line="18" column="74" selection-start-line="18" selection-start-column="74" selection-end-line="18" selection-end-column="74" />
<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">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="434.02942">
<caret line="10" column="124543" selection-start-line="10" selection-start-column="124543" selection-end-line="10" selection-end-column="124543" />
<folding />
</state>
</provider>
</entry>
@@ -92,29 +113,21 @@
<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" />
<state vertical-scroll-proportion="-9.762712">
<caret line="44" column="110" selection-start-line="44" selection-start-column="110" selection-end-line="44" selection-end-column="110" />
<folding />
</state>
</provider>
</entry>
</file>
<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="-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="routes.php" pinned="false" current-in-tab="true">
<file leaf-file-name="routes.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/routes.php">
<provider selected="true" editor-type-id="text-editor">
<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 vertical-scroll-proportion="-18.666666">
<caret line="34" column="48" selection-start-line="34" selection-start-column="27" selection-end-line="34" selection-end-column="48" />
<folding>
<element signature="e#7#392#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
@@ -122,8 +135,8 @@
<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="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" />
<state vertical-scroll-proportion="-26.37037">
<caret line="49" column="124" selection-start-line="49" selection-start-column="124" selection-end-line="49" selection-end-column="124" />
<folding />
</state>
</provider>
@@ -132,18 +145,8 @@
<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="-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="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="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" />
<state vertical-scroll-proportion="-26.666666">
<caret line="87" column="46" selection-start-line="87" selection-start-column="46" selection-end-line="87" selection-end-column="46" />
<folding />
</state>
</provider>
@@ -167,27 +170,37 @@
<option value="$PROJECT_DIR$/artisan" />
<option value="$PROJECT_DIR$/app/models/Comment.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$/public/css/bootstrap-superhero.min.css" />
<option value="$PROJECT_DIR$/app/views/hello.blade.php" />
<option value="$PROJECT_DIR$/app/models/Film.php" />
<option value="$PROJECT_DIR$/app/routes.php" />
<option value="$PROJECT_DIR$/app/views/users.blade.php" />
<option value="$PROJECT_DIR$/app/views/index.blade.php" />
<option value="$PROJECT_DIR$/app/views/suggest.blade.php" />
<option value="$PROJECT_DIR$/app/views/film.blade.php" />
<option value="$PROJECT_DIR$/app/views/seen.blade.php" />
</list>
</option>
</component>
<component name="JsBuildToolGruntFileManager" detection-done="true" />
<component name="JsGulpfileManager">
<detection-done>true</detection-done>
</component>
<component name="NamedScopeManager">
<order />
</component>
<component name="PhpServers">
<servers />
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true">
<include_path>
<path value="$PROJECT_DIR$/vendor/doctrine/lexer" />
@@ -225,9 +238,29 @@
</include_path>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="-1" />
<option name="width" value="1922" />
<option name="height" value="1055" />
<option name="x" value="123" />
<option name="y" value="125" />
<option name="width" value="1797" />
<option name="height" value="955" />
</component>
<component name="ProjectInspectionProfilesVisibleTreeState">
<entry key="Project Default">
<profile-state>
<expanded-state>
<State>
<id />
</State>
<State>
<id>Spelling</id>
</State>
</expanded-state>
<selected-state>
<State>
<id>Spelling</id>
</State>
</selected-state>
</profile-state>
</entry>
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" />
@@ -252,6 +285,8 @@
<sortByType />
</navigator>
<panes>
<pane id="Scratches" />
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -270,56 +305,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>
<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="img" />
<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="css" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="dumbo" />
@@ -352,9 +337,26 @@
<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="models" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -362,6 +364,8 @@
<property name="list.type.of.created.stylesheet" value="CSS" />
<property name="LayoutCode.rearrangeEntriesBlade" value="false" />
<property name="FullScreen" value="false" />
<property name="settings.editor.selected.configurable" value="Errors" />
<property name="settings.editor.splitter.proportion" value="0.2" />
</component>
<component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
@@ -369,18 +373,21 @@
</key>
</component>
<component name="RunManager">
<configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
<method />
</configuration>
<configuration default="true" type="PHPUnitRunConfigurationType" factoryName="PHPUnit">
<TestRunner />
<method />
</configuration>
<configuration default="true" type="PhpBehatConfigurationType" factoryName="Behat">
<BehatRunner />
<method />
</configuration>
<configuration default="true" type="PhpLocalRunConfigurationType" factoryName="PHP Console">
<method />
</configuration>
<configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
<method />
</configuration>
<configuration default="true" type="PhpBehatConfigurationType" factoryName="Behat">
<BehatRunner />
<configuration default="true" type="PhpUnitRemoteRunConfigurationType" factoryName="PHPUnit on Server">
<method />
</configuration>
<configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
@@ -392,10 +399,6 @@
<envs />
<method />
</configuration>
<configuration default="true" type="PhpUnitRemoteRunConfigurationType" factoryName="PHPUnit on Server">
<method />
</configuration>
<list size="0" />
</component>
<component name="ShelveChangesManager" show_recycled="false" />
<component name="SvnConfiguration">
@@ -414,24 +417,30 @@
<option name="project" value="LOCAL" />
<updated>1417707403055</updated>
</task>
<option name="localTasksCounter" value="2" />
<task id="LOCAL-00002" summary="Sommer Style, Avatare, Duplikate">
<created>1433778557857</created>
<option name="number" value="00002" />
<option name="project" value="LOCAL" />
<updated>1433778557857</updated>
</task>
<option name="localTasksCounter" value="3" />
<servers />
</component>
<component name="ToolWindowManager">
<frame x="-1" y="0" width="1922" height="1055" extended-state="6" />
<frame x="123" y="125" width="1797" height="955" extended-state="0" />
<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" />
<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="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="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="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.16771609" 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" />
<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="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" />
@@ -460,9 +469,9 @@
<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" />
<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-to-restore>
</component>
<component name="Vcs.Log.UiProperties">
@@ -477,11 +486,9 @@
<option name="myLimit" value="2678400000" />
</component>
<component name="VcsManagerConfiguration">
<option name="myTodoPanelSettings">
<TodoPanelSettings />
</option>
<MESSAGE value="Winter style" />
<option name="LAST_COMMIT_MESSAGE" value="Winter style" />
<MESSAGE value="Sommer Style, Avatare, Duplikate" />
<option name="LAST_COMMIT_MESSAGE" value="Sommer Style, Avatare, Duplikate" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager />
@@ -490,23 +497,7 @@
<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">
<state vertical-scroll-proportion="0.0">
<caret line="39" column="23" selection-start-line="39" selection-start-column="23" selection-end-line="39" selection-end-column="23" />
<folding />
</state>
@@ -514,74 +505,70 @@
</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">
<state vertical-scroll-proportion="0.0">
<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">
<state vertical-scroll-proportion="0.0">
<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">
<state vertical-scroll-proportion="0.0">
<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">
<state vertical-scroll-proportion="0.0">
<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">
<state vertical-scroll-proportion="0.0">
<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">
<state vertical-scroll-proportion="0.0">
<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">
<state vertical-scroll-proportion="0.0">
<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">
<state vertical-scroll-proportion="0.0">
<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">
<state vertical-scroll-proportion="0.0">
<caret line="124" column="6" selection-start-line="124" selection-start-column="6" selection-end-line="124" selection-end-column="6" />
</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="594" max-vertical-offset="7434">
<state vertical-scroll-proportion="0.0">
<caret line="42" column="37" selection-start-line="42" selection-start-column="37" selection-end-line="42" selection-end-column="37" />
<folding />
</state>
@@ -589,290 +576,312 @@
</entry>
<entry file="file://$PROJECT_DIR$/app/models/Comment.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="396">
<state vertical-scroll-proportion="0.0">
<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$/app/views/index.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="234" max-vertical-offset="2088">
<state vertical-scroll-proportion="0.0">
<caret line="13" column="127" selection-start-line="13" selection-start-column="127" selection-end-line="13" selection-end-column="127" />
</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="414" max-vertical-offset="1584">
<state vertical-scroll-proportion="0.0">
<caret line="23" column="62" selection-start-line="23" selection-start-column="24" selection-end-line="23" selection-end-column="62" />
</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="468" max-vertical-offset="1224">
<state vertical-scroll-proportion="0.0">
<caret line="26" column="38" selection-start-line="26" selection-start-column="38" selection-end-line="26" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/config/database.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="1.2450175" vertical-offset="0" max-vertical-offset="2340">
<state vertical-scroll-proportion="1.2450175">
<caret line="59" column="44" selection-start-line="59" selection-start-column="28" selection-end-line="59" selection-end-column="44" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/index.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.8862837" vertical-offset="0" max-vertical-offset="864">
<state vertical-scroll-proportion="0.8862837">
<caret line="42" column="12" selection-start-line="42" selection-start-column="12" selection-end-line="42" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/composer.json">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-3.3333333" vertical-offset="0" max-vertical-offset="774">
<state vertical-scroll-proportion="-3.3333333">
<caret line="5" column="33" selection-start-line="5" selection-start-column="33" selection-end-line="5" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/config/session.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-14.925926" vertical-offset="1505" max-vertical-offset="2394">
<state vertical-scroll-proportion="-14.925926">
<caret line="106" column="5" selection-start-line="106" selection-start-column="5" selection-end-line="106" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/config/queue.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-13.592592" vertical-offset="263" max-vertical-offset="1188">
<state vertical-scroll-proportion="-13.592592">
<caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/controllers/BaseController.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.3587339" vertical-offset="0" max-vertical-offset="853">
<state vertical-scroll-proportion="0.3587339">
<caret line="17" column="1" selection-start-line="17" selection-start-column="1" selection-end-line="17" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/config/view.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-20.666666" vertical-offset="0" max-vertical-offset="666">
<state vertical-scroll-proportion="-20.666666">
<caret line="31" column="0" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/artisan">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.27198124" vertical-offset="272" max-vertical-offset="1422">
<state vertical-scroll-proportion="0.27198124">
<caret line="28" column="0" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/controllers/FilmController.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.18991794" vertical-offset="0" max-vertical-offset="853">
<state vertical-scroll-proportion="0.18991794">
<caret line="9" column="7" selection-start-line="9" selection-start-column="7" selection-end-line="9" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/css/bootstrap-default.css">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.33295456" vertical-offset="94585" max-vertical-offset="123660">
<state vertical-scroll-proportion="0.33295456">
<caret line="5221" column="0" selection-start-line="5221" selection-start-column="0" selection-end-line="5221" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/models/Comment.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-10.666667" vertical-offset="0" max-vertical-offset="396">
<state vertical-scroll-proportion="-10.666667">
<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">
<state vertical-scroll-proportion="-7.509091">
<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">
<state vertical-scroll-proportion="0.0">
<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">
<state vertical-scroll-proportion="0.020454545">
<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-cyborg.min.css">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="25218">
<state vertical-scroll-proportion="0.0">
<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$/public/css/bootstrap-my.min.css">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.025974026" vertical-offset="0" max-vertical-offset="21078">
<state vertical-scroll-proportion="0.025974026">
<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.css">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="134046">
<state vertical-scroll-proportion="-0.0">
<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-superhero.min.css">
<provider selected="true" editor-type-id="text-editor">
<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="30.83117" vertical-offset="0" max-vertical-offset="21474">
<state vertical-scroll-proportion="30.83117">
<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/.htaccess">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.15584415" vertical-offset="0" max-vertical-offset="693">
<state vertical-scroll-proportion="0.15584415">
<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.3323217" vertical-offset="7269" max-vertical-offset="17568">
<state vertical-scroll-proportion="0.3323217">
<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-sandstone.min.css">
<provider selected="true" editor-type-id="text-editor">
<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$/app/views/index.blade.php">
<provider selected="true" editor-type-id="text-editor">
<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">
<state vertical-scroll-proportion="0.17932752">
<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">
<state vertical-scroll-proportion="0.34371108">
<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">
<entry file="file://$PROJECT_DIR$/public/css/bootstrap-paper.min.css">
<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 vertical-scroll-proportion="0.0">
<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="false" />
<element signature="e#127570#127845#2" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/css/bootstrap-readable.min.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.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="-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/models/Film.php">
<provider selected="true" editor-type-id="text-editor">
<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" />
<state vertical-scroll-proportion="0.0">
<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$/app/views/settings.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-11.333333" vertical-offset="180" max-vertical-offset="2124">
<state vertical-scroll-proportion="0.0">
<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$/public/css/bootstrap-paper.min.css">
<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="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 vertical-scroll-proportion="21.155056">
<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$/public/css/bootstrap-superhero.min.css">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="434.02942">
<caret line="10" column="124543" selection-start-line="10" selection-start-column="124543" selection-end-line="10" selection-end-column="124543" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/views/users.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-5.4915257">
<caret line="18" column="74" selection-start-line="18" selection-start-column="74" selection-end-line="18" selection-end-column="74" />
<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$/app/views/film.blade.php">
<provider selected="true" editor-type-id="text-editor">
<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" />
<state vertical-scroll-proportion="-9.762712">
<caret line="44" column="110" selection-start-line="44" selection-start-column="110" selection-end-line="44" selection-end-column="110" />
<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.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" />
<state vertical-scroll-proportion="-18.666666">
<caret line="34" column="48" selection-start-line="34" selection-start-column="27" selection-end-line="34" selection-end-column="48" />
<folding>
<element signature="e#7#392#0#PHP" expanded="true" />
</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="-26.666666">
<caret line="87" column="46" selection-start-line="87" selection-start-column="46" selection-end-line="87" selection-end-column="46" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/models/Film.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-26.37037">
<caret line="49" column="124" selection-start-line="49" selection-start-column="124" selection-end-line="49" selection-end-column="124" />
<folding />
</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="-7.322034">
<caret line="78" column="276" selection-start-line="78" selection-start-column="276" selection-end-line="78" selection-end-column="276" />
<folding>
<element signature="e#2694#2718#0#HTML" expanded="true" />
<element signature="e#2838#2881#0#HTML" expanded="true" />
<element signature="e#4487#4513#0#HTML" expanded="true" />
<element signature="e#5611#5636#0#HTML" expanded="true" />
<element signature="e#7160#7186#0#HTML" expanded="true" />
<element signature="e#7565#7590#0#HTML" expanded="true" />
<element signature="e#8470#8496#0#HTML" expanded="true" />
</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.576271">
<caret line="15" column="67" selection-start-line="15" selection-start-column="67" selection-end-line="15" selection-end-column="67" />
<folding />
</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="-6.377049">
<caret line="54" column="38" selection-start-line="53" selection-start-column="120" selection-end-line="55" selection-end-column="27" />
<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#5206#5252#0#HTML" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/views/seen.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.6240209">
<caret line="31" column="7" selection-start-line="31" selection-start-column="7" selection-end-line="31" selection-end-column="7" />
<folding />
</state>
</provider>
app/models/Film.php
+30
View File
@@ -23,4 +23,34 @@ class Film extends Eloquent {
return $query->whereNull('gesehen')->orderBy('updated_at', 'DESC')->take(5);
}
public function scopeMeistgewunschteVorschlage($query) {
$nextfilm = Dumbo::find(1)->film;
return $query
->addSelect(DB::raw('film_films.*, COUNT(case when film_votes.stimme IS TRUE then 1 end) as upvotes'))
->leftJoin('votes', 'votes.film', '=', 'films.id')
->whereNull('gesehen')
->where('films.id', "!=", is_object($nextfilm) ? $nextfilm->id : 0)
->groupBy('films.id')
->orderBy('upvotes', 'DESC')
->orderBy('vorgeschlagen', 'ASC')
->take(5);
}
public function getVotes() {
return Vote::where('film', '=', $this->id)->count();
}
public function getUpvotes() {
return Vote::where('film', '=', $this->id)->whereRaw('stimme IS TRUE')->count();
}
public function getBewertung() {
if(!is_null($this->gesehen)) {
$count = Comment::where('film', $this->id)->where('bewertung', '>', 0)->count();
return $count > 0 ? Comment::where('film', $this->id)->where('bewertung', '>', 0)->sum('bewertung') / $count : 0;
} else return (0);
}
}
app/routes.php
+20 -23
View File
@@ -11,46 +11,43 @@
|
*/
define('TMDB_API_KEY', 'b187f8d9c5e72b1faecb741d5d04239a');
Route::get('/', function()
{
$gesehen = Film::zuletztGesehen()->get();
$vorgeschlagen = Film::neuesteVorschlage()->get();
$mg = Film::meistgewunschteVorschlage()->get();
$news = News::aktuell()->get();
$nextfilm = Dumbo::find(1)->film;
$topfilm = DB::table(DB::raw('film_films'))
->select(DB::raw('film_films.*, COUNT(case when film_votes.stimme IS TRUE then 1 end) as upvotes,
COUNT(case when film_votes.stimme IS FALSE then 1 end) as downvotes,
COUNT(case when film_votes.stimme IS TRUE then 1 end) as vcount'))
->leftJoin('votes', 'votes.film', '=', 'films.id')
->whereNull('films.gesehen')
->where('films.id', "!=", is_object($nextfilm) ? $nextfilm->id : 0)
->groupBy('id')
->orderBy('vcount', 'DESC')->orderBy('vorgeschlagen', 'ASC')
->first();
$tmdb = new TMDb('b187f8d9c5e72b1faecb741d5d04239a', 'de', TRUE);
$tmovie = $tmdb->getMovie($topfilm->tvdbid);
$image = $tmdb->getImageUrl($tmovie['poster_path'], TMDb::IMAGE_POSTER, 'w342');
$tmdb = new TMDb(TMDB_API_KEY, 'de', TRUE);
foreach(array("top" => $mg[0], "neu" => $vorgeschlagen[0], "alt" => $gesehen[0]) as $key => $val) {
$tmovie = $tmdb->getMovie($val->tvdbid);
$images[$key] = $tmdb->getImageUrl($tmovie['poster_path'], TMDb::IMAGE_POSTER, 'w342');
}
if(is_object($nextfilm)) {
$tmovie = $tmdb->getMovie($nextfilm->tvdbid);
$nimage = $tmdb->getImageUrl($tmovie['poster_path'], TMDb::IMAGE_POSTER, 'w342');
$images["next"] = $tmdb->getImageUrl($tmovie['poster_path'], TMDb::IMAGE_POSTER, 'w342');
} else {
$nimage = "img/no-poster-w92.jpg";
$images["next"] = "img/no-poster-w92.jpg";
}
$kommentare = Comment::neueste()->get();
return View::make('index')
$labels = array("", "danger", "danger", "warning", "warning", "info", "info", "primary", "primary", "success", "success");
return View::make('index')
->with('gesehen', $gesehen)
->with('vorgeschlagen', $vorgeschlagen)
->with('image', $image)
->with('nimage', $nimage)
->with('meistgw', $mg)
->with('images', $images)
->with('news', $news)
->with('kommentare', $kommentare)
->with('nextfilm', $nextfilm)
->with('topfilm', $topfilm);
->with('labels', $labels)
->with('nextfilm', $nextfilm);
});
Route::get('film/{id}', array('as' => 'film', function($id) {
@@ -67,12 +64,12 @@ Route::get('film/{id}', array('as' => 'film', function($id) {
$pv = array();
foreach($film->votes()->where('stimme', true)->get() as $v) {
$pv[] = $v->voter->name;
$pv[] = $v->voter;
}
$nv = array();
foreach($film->votes()->where('stimme', false)->get() as $v) {
$nv[] = $v->voter->name;
$nv[] = $v->voter;
}
if(!is_null(Auth::user()) && $film->votes()->where('user', Auth::user()->id)->count() > 0) {
app/views/film.blade.php
+21 -17
View File
@@ -12,9 +12,12 @@
@else
<div class="label label-danger" <?php if(!is_null(Auth::user()) && Auth::user()->admin) { echo "id='gesehen'"; } ?> style="cursor: pointer;"><span class="glyphicon glyphicon-unchecked"></span> Nicht gesehen</div>
@endif
<span class="label label-info">
<img class="img-circle" src="{{ $film->besitzer->getAvatar() }}" width="16"> {{$film->besitzer->name}}
</span>
</div>
<div class="col-md-9">
<ul class="nav nav-tabs">
<ul class="nav nav-pills">
<li class="active"><a href="#ueberblick" data-toggle="tab">Überblick</a></li>
<li><a href="#cast" data-toggle="tab">Schauspieler</a></li>
<li><a href="#trailer" data-toggle="tab">Trailer</a></li>
@@ -53,14 +56,10 @@
</dd>
<dt>Bewertung</dt>
<dd>{{ $tfilm['vote_average']}} von 10 </dd>
@if(!is_null($film->gesehen) && Comment::where('film', $film->id)->where('bewertung', '>', 0)->count() > 0)
@if($film->getBewertung() > 0)
<dt>Eigene Bewertung</dt>
<dd>
<?php
$count = Comment::where('film', $film->id)->where('bewertung', '>', 0)->count();
$avg = Comment::where('film', $film->id)->where('bewertung', '>', 0)->sum('bewertung') / $count;
?>
<div class="label label-{{$labels[round($avg)]}}">{{$avg}}</div>
<div class="label label-{{$labels[round($film->getBewertung())]}}">{{$film->getBewertung()}}</div>
</dd>
@endif
@for($i = 0; $i < 3 && $i < count($cast['crew']); $i++)
@@ -77,7 +76,7 @@
<div class="row" style="margin-top:10px;">
@for($i = 0; $i < 10 && $i < count($cast['cast']); $i++)
<div class="col-md-6">
<div class="pull-left" style="margin-right:5px; min-height: 80px;"><img class="img-thumbnail media-object" src="{{ !is_null($cast['cast'][$i]['profile_path']) ? $tmdb->getImageUrl($cast['cast'][$i]['profile_path'], TMDb::IMAGE_PROFILE, 'w185') : "http://d3a8mw37cqal2z.cloudfront.net/assets/649ae87ebcf4285/images/no-profile-w185.jpg"}}" alt="{{$cast['cast'][$i]['name']}}" width="55"></div>
<div class="pull-left" style="margin-right:5px; min-height: 80px;"><img class="media-object" src="{{ !is_null($cast['cast'][$i]['profile_path']) ? $tmdb->getImageUrl($cast['cast'][$i]['profile_path'], TMDb::IMAGE_PROFILE, 'w185') : asset("img/no-avatar.jpg") }}" alt="{{$cast['cast'][$i]['name']}}" width="55"></div>
<div class="media-body">
<h4 class="media-heading">{{$cast['cast'][$i]['name']}}</h4>
{{$cast['cast'][$i]['character']}}
@@ -91,7 +90,7 @@
</div>
<div class="tab-pane" id="trailer">
@foreach($trail['youtube'] as $yt)
<iframe width="420" height="315" src="//www.youtube.com/embed/{{ $yt['source'] }}" frameborder="0" allowfullscreen></iframe>
<p></p><iframe width="420" height="315" src="//www.youtube.com/embed/{{ $yt['source'] }}" frameborder="0" allowfullscreen></iframe>
@endforeach
</div>
</div>
@@ -110,13 +109,18 @@
<dt>Daf&uuml;r</dt>
<dd>
@foreach($pv as $v)
<span class="badge">{{$v}}</span>
<span class="badge">
<img class="img-circle" src="{{ $v->getAvatar() }}" width="20"> {{$v->name}}
</span>&nbsp;
@endforeach
</dd>
<p></p>
<dt>Nicht daf&uuml;r</dt>
<dd>
@foreach($nv as $v)
<span class="badge">{{$v}}</span>
<span class="badge">
<img class="img-circle" src="{{ $v->getAvatar() }}" width="20"> {{$v->name}}
</span>&nbsp;
@endforeach
</dd>
</dl>
@@ -129,7 +133,7 @@
<a class="btn btn-lg btn-success <?php echo $uvote[0] && $uvote[1] ? "disabled" : ""; ?>" href="{{ url('vote', array('yes', Auth::user()->id, $film->id)) }}">
<span class="glyphicon glyphicon-thumbs-up"></span> Daf&uuml;r
</a>
<a class="btn btn-lg btn-warning <?php echo $uvote[0] && !$uvote[1] ? "disabled" : ""; ?>" href="{{ url('vote', array('no', Auth::user()->id, $film->id)) }}">
<a class="btn btn-lg btn-default <?php echo $uvote[0] && !$uvote[1] ? "disabled" : ""; ?>" href="{{ url('vote', array('no', Auth::user()->id, $film->id)) }}">
<span class="glyphicon glyphicon-hand-right"></span> Nicht daf&uuml;r
</a>
</div>
@@ -187,7 +191,7 @@
<div class="pull-left label label-{{ $labels[$comment->bewertung] }}" style="margin-right: 5px;">{{$comment->bewertung}}</div>
@endif
<p>{{$comment->text}}</p>
<button type="button" class="btn btn-xs" onclick="toggleComment('#comment{{$comment->id}}')">Bearbeiten</button>
<button type="button" class="btn btn-default btn-xs" onclick="toggleComment('#comment{{$comment->id}}')">Bearbeiten</button>
</div>
<div class="collapse" id="comment{{$comment->id}}edit">
{{Form::open(array('route' => 'modcomment'))}}
@@ -206,7 +210,7 @@
<div class="form-group"><textarea class="form-control" rows="1" name="text">{{$comment->text}}</textarea></div>
<div class="form-group">
<button type="submit" class="btn btn-primary btn-xs">Absenden</button>
<button type="button" class="btn btn-xs" onclick="toggleComment('#comment{{$comment->id}}')">Abbrechen</button>
<button type="button" class="btn btn-default btn-xs" onclick="toggleComment('#comment{{$comment->id}}')">Abbrechen</button>
</div>
{{Form::close()}}
</div>
@@ -231,9 +235,9 @@
$(id + 'comment').collapse('toggle');
}
$(function() {
$('.tooltip-enable').tooltip({ html: true, placement: "bottom" });
});
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
$(function() {
$('#gesehen').popover({
app/views/hello.blade.php
+3 -5
View File
@@ -4,18 +4,16 @@
<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.css') }}" type="text/css" rel="stylesheet">
<link href="{{ asset('css/bootstrap-superhero.min.css') }}" type="text/css" rel="stylesheet">
<link href="{{ asset('css/general.css') }}" type="text/css" rel="stylesheet">
@yield('styles')
</head>
<body><div id="wrap">
<div class="navbar navbar-inverse navbar-static-top" role="navigation">
<div class="navbar navbar-inversex navbar-static-top" role="navigation">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="glyphicon glyphicon-menu-hamburger" aria-hidden="true"></span>
</button>
{{ HTML::link('/', 'Dumbo', array("class" => "navbar-brand")) }}
</div>
app/views/index.blade.php
+97 -64
View File
@@ -3,91 +3,95 @@
@section('content')
<div class="row">
<div class="col-md-6">
<div class="panel panel-info">
<div class="panel panel-primary">
<div class="panel-heading">Meistgew&uuml;nschter Film</div>
<div class="panel-body">
<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-deciduous"></span>&nbsp;{{$topfilm->downvotes + $topfilm->upvotes}}</p>
<?php $topfilm = $meistgw->shift(); ?>
<img src="{{$images["top"]}}" 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><span class="glyphicon glyphicon-thumbs-up"></span>&nbsp;{{$topfilm->getUpvotes()}}
<span class="glyphicon glyphicon-transfer"></span>&nbsp;{{$topfilm->getVotes()}}</p>
{{ link_to_route('film', "Filmdetails", array($topfilm->id), array('class' => 'btn btn-info btn-xs'))}}
@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
</div>
<div class="list-group">
{{ link_to_route('film', "Filmdetails", array($topfilm->id), array('class' => 'list-group-item'))}}
{{ link_to('beliebt', 'Mehr beliebte Filme', array('class' => 'list-group-item')); }}
@foreach ($meistgw 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('beliebt', 'Mehr...', array('class' => 'list-group-item')); }}</i>
</div>
</div>
<div class="panel panel-success">
<div class="panel-heading">Neue Vorschl&auml;ge</div>
<div class="panel-body">
<?php $topfilm = $vorgeschlagen->shift(); ?>
<img src="{{$images["neu"]}}" 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><span class="glyphicon glyphicon-thumbs-up"></span>&nbsp;{{$topfilm->getUpvotes()}}
<span class="glyphicon glyphicon-transfer"></span>&nbsp;{{$topfilm->getVotes()}}</p>
{{ link_to_route('film', "Filmdetails", array($topfilm->id), array('class' => 'btn btn-info btn-xs'))}}
@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
</div>
<div class="list-group">
@foreach ($vorgeschlagen 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="15"> {{$film->besitzer->name}}
</span></small></a>
@endforeach
<i>{{ link_to('vorgeschlagen', 'Mehr...', array('class' => 'list-group-item')); }}</i>
</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>
@endforeach
</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="{{$nimage}}" class="pull-left thumbnail" style="max-height: 100px; margin-right: 15px;">
<h4>{{is_object($nextfilm) ? $nextfilm->name : "Steht nicht fest"}}</h4>
<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>
@if(is_object($nextfilm))
<div class="list-group">
{{ link_to_route('film', "Filmdetails", array($nextfilm->id), array('class' => 'list-group-item'))}}
</div>
@endif
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="panel panel-success">
<div class="panel-heading">Neue Vorschl&auml;ge</div>
<div class="list-group">
@foreach ($vorgeschlagen as $film)
<a href="{{ route('film', array($film->id)); }}" class="list-group-item">{{$film->name}} <small>({{ $film->besitzer->name }})</small></a>
@endforeach
{{ link_to('vorgeschlagen', 'Mehr...', array('class' => 'list-group-item')); }}
</div>
</div>
</div>
<div class="col-md-6">
<div class="panel panel-danger">
<div class="panel-heading">Gesehene Filme</div>
<div class="list-group">
@foreach ($gesehen as $film)
{{ link_to_route('film', $film->name, array($film->id), array('class' => 'list-group-item'))}}
@endforeach
{{ link_to('gesehen', 'Mehr...', array('class' => 'list-group-item')); }}
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="panel-group" id="accordion">
@foreach ($news as $new)
<div class="panel panel-warning">
<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>{{$new->ersteller->name}} - {{\Carbon\Carbon::parse($new->updated_at)->format('d.m.Y')}}</small>
</h4>
</div>
<div id="news{{$new->id}}" class="panel-collapse collapse">
<div class="panel-body">{{nl2br(htmlentities($new->body))}}</div>
</div>
</div>
@endforeach
</div>
</div>
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">Letzte Kommentare</div>
@@ -104,6 +108,35 @@
@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>
</div>
</div>
app/views/seen.blade.php
+5 -3
View File
@@ -16,8 +16,10 @@
<tr>
<td>{{ HTML::link('film/' . $film->id, $film->name) }}</td>
<td>{{ \Carbon\Carbon::parse($film->gesehen)->format('d.m.Y')}}</td>
<td>{{ $film->besitzer->name }}</td>
<td>{{ $film->comments()->count()}}</td>
<td><span class="badge">
<img class="img-circle" src="{{ $film->besitzer->getAvatar() }}" width="20"> {{$film->besitzer->name}}
</span></td>
<td><span class="glyphicon glyphicon-comment"></span> {{ $film->comments()->count()}}</td>
</tr>
@endforeach
</table>
@@ -27,7 +29,7 @@
@stop
@section('title')
Vorschläge ~
Gesehen ~
@stop
@section('script')
app/views/suggest.blade.php
+7 -3
View File
@@ -27,7 +27,7 @@
$vp = $film->upvotes;
$np = $film->downvotes;
?>
<span class="glyphicon glyphicon-tree-deciduous"></span>&nbsp;{{ $vp + $np }}
<span class="glyphicon glyphicon-transfer"></span>&nbsp;{{ $vp + $np }}
</td>
<td>
@if(($vp) > 0) <span class="label label-default">+{{$vp}}</span>
@@ -36,11 +36,15 @@
@if($stimme == 1)
&nbsp;<span class="label label-success tooltip-enable" data-toggle="tooltip" title="Daf&uuml;r gestimmt."><span class="glyphicon glyphicon-thumbs-up"></span></span>
@elseif($stimme == 0)
&nbsp;<span class="label label-warning tooltip-enable" data-toggle="tooltip" title="Nicht daf&uuml;r gestimmt."><span class="glyphicon glyphicon-hand-right"></span></span>
&nbsp;<span class="label label-default tooltip-enable" data-toggle="tooltip" title="Nicht daf&uuml;r gestimmt."><span class="glyphicon glyphicon-hand-right"></span></span>
@endif
</td>
<td>{{ \Carbon\Carbon::parse($film->vorgeschlagen)->format('d.m.Y')}}</td>
<td>{{ Film::find($film->id)->besitzer->name }}</td>
<td>
<span class="badge">
<img class="img-circle" src="{{ Film::find($film->id)->besitzer->getAvatar() }}" width="20"> {{Film::find($film->id)->besitzer->name}}
</span>
</td>
</tr>
@endforeach
</table>
app/views/users.blade.php
+2
View File
@@ -7,6 +7,7 @@
<table class="table">
<tr>
<th></th>
<th>Name</th>
<th>Email</th>
<th>Filme</th>
@@ -15,6 +16,7 @@
</tr>
@foreach($users as $user)
<tr>
<td><img class="img-circle" src="{{$user->getAvatar()}}" width="32"></td>
<td>{{$user->name}}</td>
<td>{{$user->email}}</td>
<td>{{$user->films()->count()}}</td>
public/css/bootstrap-superhero.min.css
Vendored
+8 -4
View File
@@ -1,7 +1,11 @@
@import url("//fonts.googleapis.com/css?family=Lato:300,400,700");/*!
* bootswatch v3.3.1+2
@import url("https://fonts.googleapis.com/css?family=Lato:300,400,700");/*!
* bootswatch v3.3.5
* Homepage: http://bootswatch.com
* Copyright 2012-2014 Thomas Park
* Copyright 2012-2015 Thomas Park
* Licensed under MIT
* Based on Bootstrap
*//*! normalize.css v3.0.2 | MIT License | git.io/normalize */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}h1{font-size:2em;margin:0.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace, monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type="checkbox"],input[type="radio"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:bold}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */@media print{*,*:before,*:after{background:transparent !important;color:#000 !important;-webkit-box-shadow:none !important;box-shadow:none !important;text-shadow:none !important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="#"]:after,a[href^="javascript:"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100% !important}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}select{background:#fff !important}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000 !important}.label{border:1px solid #000}.table{border-collapse:collapse !important}.table td,.table th{background-color:#fff !important}.table-bordered th,.table-bordered td{border:1px solid #ddd !important}}@font-face{font-family:'Glyphicons Halflings';src:url('../fonts/glyphicons-halflings-regular.eot');src:url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),url('../fonts/glyphicons-halflings-regular.woff') format('woff'),url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'),url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-euro:before,.glyphicon-eur:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:beforeLine truncated
*//*!
* Bootstrap v3.3.5 (http://getbootstrap.com)
* Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}h1{font-size:2em;margin:0.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace, monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type="checkbox"],input[type="radio"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto}input[type="search"]{-webkit-appearance:textfield;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:bold}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */@media print{*,*:before,*:after{background:transparent !important;color:#000 !important;-webkit-box-shadow:none !important;box-shadow:none !important;text-shadow:none !important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="#"]:after,a[href^="javascript:"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100% !important}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000 !important}.label{border:1px solid #000}.table{border-collapse:collapse !important}.table td,.table th{background-color:#fff !important}.table-bordered th,.table-bordered td{border:1px solid #ddd !important}}@font-face{font-family:'Glyphicons Halflings';src:url('../fonts/glyphicons-halflings-regular.eot');src:url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),url('../fonts/glyphicons-halflings-regular.woff2') format('woff2'),url('../fonts/glyphicons-halflings-regular.woff') format('woff'),url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'),url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-euro:before,.glyphicon-eur:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-altLine truncated