Refactored whitewashing.de layout out of the blog bundle and added pa…

…rtials for all the interesting panels/elements. Added an eample layout for apps/views that shows how to put it all together.
beberlei · Feb 6, 2011 · c0b83e1 · c0b83e1
1 parent 75fc6a5
commit c0b83e1
Show file tree

Hide file tree

Showing 23 changed files with 119 additions and 219 deletions.
diff --git a/BlogBundle/Controller/AdminPostController.php b/BlogBundle/Controller/AdminPostController.php
@@ -21,14 +21,14 @@ class AdminPostController extends AbstractBlogController
 {
     public function indexAction()
     {
-        return $this->render('WhitewashingBlogBundle:AdminPost:dashboard.twig.html', array(
+        return $this->render('WhitewashingBlogBundle:AdminPost:dashboard.html.twig', array(
             'user' => $this->container->get('security.context')->getUser()
         ));
     }
 
     public function manageAction()
     {
-        return $this->render('WhitewashingBlogBundle:AdminPost:manage.twig.html', array(
+        return $this->render('WhitewashingBlogBundle:AdminPost:manage.html.twig', array(
             'posts' => $this->container->get('whitewashing.blog.postservice')->getCurrentPosts()
         ));
     }
@@ -44,14 +44,14 @@ public function newAction()
 
         $post = new \Whitewashing\Blog\Post($author, $blog);
 
-        return $this->handleForm('WhitewashingBlogBundle:AdminPost:new.twig.html', $post);
+        return $this->handleForm('WhitewashingBlogBundle:AdminPost:new.html.twig', $post);
     }
 
     public function editAction($id)
     {
         $post = $this->container->get('whitewashing.blog.postservice')->findPost($id);
 
-        return $this->handleForm('WhitewashingBlogBundle:AdminPost:edit.twig.html', $post);
+        return $this->handleForm('WhitewashingBlogBundle:AdminPost:edit.html.twig', $post);
     }
 
     /**
@@ -62,12 +62,13 @@ public function editAction($id)
     private function handleForm($viewName, $post)
     {
         $builder = $this->container->get('whitewashing.blog.bundle.formbuilder');
-        
+
         $writePost = new WritePostProcess($post);
         $form = $builder->createWritePostForm($writePost);
 
         if ($this->getRequest()->getMethod() == 'POST') {
-            $form->bind($this->getRequest()->get('writepost'));
+
+            $form->bind($this->getRequest()->get('writepost'), $writePost);
 
             if ($form->isValid()) {
                 $em = $this->container->get('doctrine.orm.default_entity_manager');
@@ -98,9 +99,9 @@ public function deleteAction($id)
             $em->remove($post);
             $em->flush();
 
-            return $this->render('WhitewashingBlogBundle:AdminPost:delete.twig.html', array('post' => $post));
+            return $this->render('WhitewashingBlogBundle:AdminPost:delete.html.twig', array('post' => $post));
         } else {
-            return $this->render('WhitewashingBlogBundle:AdminPost:confirmDelete.twig.html', array('post' => $post));
+            return $this->render('WhitewashingBlogBundle:AdminPost:confirmDelete.html.twig', array('post' => $post));
         }
     }
 }
diff --git a/BlogBundle/Controller/AuthorController.php b/BlogBundle/Controller/AuthorController.php
@@ -8,7 +8,7 @@ public function listAction()
     {
         $authors = $this->container->get('whitewashing.blog.authorservice')->findAll();
 
-        return $this->render('WhitewashingBlogBundle:Authort:list.twig.html', array(
+        return $this->render('WhitewashingBlogBundle:Authort:list.html.twig', array(
             'authors' => $authors,
         ));
     }

diff --git a/BlogBundle/Controller/BlogController.php b/BlogBundle/Controller/BlogController.php
@@ -33,7 +33,7 @@ public function indexAction()
         $response = $this->createResponse();
         $response->setSharedMaxAge(600);
 
-        return $this->render('WhitewashingBlogBundle:Blog:index.twig.html', array(
+        return $this->render('WhitewashingBlogBundle:Blog:index.html.twig', array(
             'posts' => $postRepository->getCurrentPosts(5)
         ), $response);
     }
@@ -47,7 +47,7 @@ public function viewAction($id)
         $response = $this->createResponse();
         $response->setSharedMaxAge(600);
 
-        return $this->render('WhitewashingBlogBundle:Blog:view.twig.html', array(
+        return $this->render('WhitewashingBlogBundle:Blog:view.html.twig', array(
             'post' => $post,
         ), $response);
     }
@@ -57,7 +57,7 @@ public function recentAction($count = 5)
         $postRepository = $this->getPostRepository();
         $posts = $postRepository->getCurrentPosts($count);
 
-        return $this->render('WhitewashingBlogBundle:Blog:recentPosts.twig.html', array('posts' => $posts));
+        return $this->render('WhitewashingBlogBundle:Blog:recentPosts.html.twig', array('posts' => $posts));
     }
 
     public function cloudAction()
@@ -86,7 +86,7 @@ public function cloudAction()
 
         usort($tags, array($this, 'sortTags'));
 
-        return $this->render('WhitewashingBlogBundle:Blog:cloud.twig.html', array('tags' => $tags));
+        return $this->render('WhitewashingBlogBundle:Blog:cloud.html.twig', array('tags' => $tags));
     }
 
     protected function sortTags($a, $b) {
@@ -103,7 +103,7 @@ public function tagAction($tagName)
         $response = $this->createResponse();
         $response->setSharedMaxAge(60 * 60 * 24);
 
-        return $this->render('WhitewashingBlogBundle:Blog:tag.twig.html', array(
+        return $this->render('WhitewashingBlogBundle:Blog:tag.html.twig', array(
             'tag' => $tag,
             'posts' => $postService->getTaggedPosts($tag->getId()),
         ), $response);

diff --git a/BlogBundle/Controller/SearchController.php b/BlogBundle/Controller/SearchController.php
@@ -35,7 +35,7 @@ public function queryAction()
 
         $result = $session->find($query);
 
-        return $this->render('WhitewashingBlogBundle:Search:query.twig.html', array(
+        return $this->render('WhitewashingBlogBundle:Search:query.html.twig', array(
             'result' => $result,
             'term' => $term,
         ));

diff --git a/BlogBundle/Form/BlogFormBuilder.php b/BlogBundle/Form/BlogFormBuilder.php
@@ -24,23 +24,23 @@
 
 class BlogFormBuilder
 {
-    private $validator;
+    private $formContext;
 
-    public function __construct($validator)
+    public function __construct($formContext)
     {
-        $this->validator = $validator;
+        $this->formContext = $formContext;
     }
 
     /**
      * Create a Form to write a post
-     * @param WritePostProcess $writePost
+     * 
      * @return Form
      */
-    public function createWritePostForm(WritePostProcess $writePost)
+    public function createWritePostForm($writePost)
     {
-        $form = new Form('writepost', $writePost, $this->validator);
+        $form = new Form('writepost', array_merge($this->formContext->getOptions()));
 
-        $postGroup = new FieldGroup('post');
+        $postGroup = new Form('post');
         if (!$writePost->getPostId()) {
             $postGroup->add(new ChoiceField('inputFormat', array(
                 'choices' => array(

diff --git a/BlogBundle/Resources/config/services.xml b/BlogBundle/Resources/config/services.xml
@@ -37,7 +37,7 @@
             <argument type="service" id="whitewashing.blog.urlgenerator" />
         </service>
         <service id="whitewashing.blog.bundle.formbuilder" class="%whitewashing.blog.bundle.formbuilder.class%">
-            <argument id="validator" type="service" />
+            <argument id="form.context" type="service" />
         </service>
 
         <service id="whitewashing.blog.urlgenerator" class="Whitewashing\Blog\UrlGenerator">
@@ -48,6 +48,7 @@
         <service id="whitewashing.bundle.view.twig.htmldisqus" class="%whitewashing.bundle.view.twig.htmldisqus.class%">
             <tag name="twig.extension" />
             <argument type="service" id="router" />
+            <argument type="service" id="service_container" />
             <argument>%whitewashing.blog.disqus_shortname%</argument>
         </service>
 

diff --git a/BlogBundle/Resources/views/AdminPost/adminNavMenu.html.twig b/BlogBundle/Resources/views/AdminPost/adminNavMenu.html.twig
diff --git a/BlogBundle/Resources/views/AdminPost/confirmDelete.html.twig b/BlogBundle/Resources/views/AdminPost/confirmDelete.html.twig
@@ -1,4 +1,4 @@
-{% extends 'WhitewashingBlogBundle::adminLayout.twig.html' %}
+{% extends '::layout.html.twig' %}
 
 {% block content %}
     <h1>Confirm Delete</h1>

diff --git a/BlogBundle/Resources/views/AdminPost/dashboard.html.twig b/BlogBundle/Resources/views/AdminPost/dashboard.html.twig
@@ -1,4 +1,4 @@
-{% extends 'WhitewashingBlogBundle::adminLayout.twig.html' %}
+{% extends '::layout.html.twig' %}
 
 {% block content %}
     <h1>Dashboard</h1>

diff --git a/BlogBundle/Resources/views/AdminPost/delete.html.twig b/BlogBundle/Resources/views/AdminPost/delete.html.twig
@@ -1,4 +1,4 @@
-{% extends 'WhitewashingBlogBundle::adminLayout.twig.html' %}
+{% extends '::layout.html.twig' %}
 
 {% block content %}
 <h1>Post deleted!</h1>

diff --git a/BlogBundle/Resources/views/AdminPost/edit.html.twig b/BlogBundle/Resources/views/AdminPost/edit.html.twig
@@ -1,4 +1,4 @@
-{% extends 'WhitewashingBlogBundle::adminLayout.twig.html' %}
+{% extends '::layout.html.twig' %}
 
 {% block content %}
     <form method="post" id="writepost" class="wwform"  action="{{ path('blog_post_edit', {'id': post.id}) }}">

diff --git a/BlogBundle/Resources/views/AdminPost/manage.html.twig b/BlogBundle/Resources/views/AdminPost/manage.html.twig
@@ -1,4 +1,4 @@
-{% extends 'WhitewashingBlogBundle::adminLayout.twig.html' %}
+{% extends '::layout.html.twig' %}
 
 {% block content %}
     <h1>Posts</h1>

diff --git a/BlogBundle/Resources/views/AdminPost/new.html.twig b/BlogBundle/Resources/views/AdminPost/new.html.twig
@@ -1,16 +1,8 @@
-{% extends 'WhitewashingBlogBundle::adminLayout.twig.html' %}
+{% extends '::layout.html.twig' %}
 
 {% block content %}
     <form id="writepost" class="wwform" method="post" action="{{ path('blog_post_new') }}">
-
-
-        <fieldset>
-            <legend>Write New Post</legend>
-
             {{ form_field(writeForm) }}
-
-        </fieldset>
-
         <input type="submit" name="submit_thenedit" value="Save" />
         <input type="submit" name="submit_thenshow" value="Save and Show" />
     </form>

diff --git a/BlogBundle/Resources/views/Blog/index.html.twig b/BlogBundle/Resources/views/Blog/index.html.twig
@@ -1,10 +1,10 @@
-{% extends "::layout.twig.html" %}
+{% extends '::layout.html.twig' %}
 
 {% block content %}
 
 {% if posts %}
 {% for p in posts %}
-    {% include 'WhitewashingBlogBundle:Blog:post.twig.html' with {'post': p} %}
+    {% include 'WhitewashingBlogBundle:Blog:post.html.twig' with {'post': p} %}
 {% endfor %}
 
 {% else %}

diff --git a/BlogBundle/Resources/views/Blog/tag.html.twig b/BlogBundle/Resources/views/Blog/tag.html.twig
@@ -1,4 +1,4 @@
-{% extends 'WhitewashingBlogBundle::layout.twig.html' %}
+{% extends '::layout.html.twig' %}
 
 {% block title %}Posts by Tag :: {{tag.name}}{% endblock %}
 
@@ -12,7 +12,7 @@
 
 {% for post in posts %}
 
-{% include 'WhitewashingBlogBundle:Blog:post.twig.html' with {'post': post} %}
+{% include 'WhitewashingBlogBundle:Blog:post.html.twig' with {'post': post} %}
 {% endfor %}
 
 {% endblock %}
diff --git a/BlogBundle/Resources/views/Blog/view.html.twig b/BlogBundle/Resources/views/Blog/view.html.twig
@@ -1,11 +1,11 @@
-{% extends 'WhitewashingBlogBundle::layout.twig.html' %}
+{% extends '::layout.html.twig' %}
 
 {% block title %}
 {{post.headline}}
 {% endblock %}
 
 {% block content %}
-{% include 'WhitewashingBlogBundle:Blog:post.twig.html' with {'post': post} %}
+{% include 'WhitewashingBlogBundle:Blog:post.html.twig' with {'post': post} %}
 
 <div class="references">
     <div class="span-10">

diff --git a/BlogBundle/Resources/views/Elements/head.html.twig b/BlogBundle/Resources/views/Elements/head.html.twig
@@ -0,0 +1,32 @@
+<!-- All the javascript and stylesheet that whitewashing blog needs -->
+<link rel="stylesheet" href="{{ asset('bundles/blog/themes/whitewashing-de/blueprint/screen.css') }}" type="text/css" media="screen, projection" />
+<link rel="stylesheet" href="{{ asset('bundles/blog/themes/whitewashing-de/blueprint/print.css') }}" type="text/css" media="print" />
+<!--[if lt IE 8]><link rel="stylesheet" href="{{ asset('bundles/blog/themes/whitewashing-de/blueprint/ie.css') }}" type="text/css" media="screen, projection" /><![endif]-->
+
+<link rel="stylesheet" href="{{ asset('bundles/blog/themes/whitewashing-de/css/whitewashing.css') }}" type="text/css" media="screen, projection" />
+<link rel="stylesheet" href="{{ asset('bundles/blog/themes/whitewashing-de/css/markup.css') }}" type="text/css" media="screen, projection" />
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js" type="text/javascript" language="javascript"></script>
+<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.6/jquery-ui.min.js" type="text/javascript" language="javascript"></script>
+<script src="{{ asset('bundles/blog/themes/admin/markitup/jquery.markitup.js') }}" type="text/javascript" language="javascript"></script>
+<script src="{{ asset('bundles/blog/themes/admin/markitup/sets/rest/set.js') }}" type="text/javascript" language="javascript"></script>
+<script src="{{ asset('bundles/blog/themes/admin/tabby/jquery.tabby.js') }}" type="text/javascript" language="javascript"></script>
+<script src="{{ asset('bundles/blog/themes/admin/wweditor.js') }}" type="text/javascript" language="javascript"></script>
+
+<link rel="stylesheet" type="text/css" href="{{ asset('bundles/blog/themes/admin/markitup/skins/simple/style.css') }}" />
+<link rel="stylesheet" type="text/css" href="{{ asset('bundles/blog/themes/admin/markitup/sets/rest/style.css') }}" />
+<link rel="stylesheet" type="text/css" href="{{ asset('bundles/blog/themes/admin/sprites/sprite.css') }}" />
+<link rel="stylesheet" type="text/css" href="{{ asset('bundles/blog/themes/admin/css/Aristo/jquery-ui-1.8.5.custom.css') }}" />
+
+<script type="text/javascript" >
+    <!--
+    $(document).ready(function() {
+        $("#writepost").wweditor({
+            "markitupSettings": {
+                "rst": restSettings
+            },
+            "tagRoute": "{{ path('blog_tags') }}"
+        });
+    });
+    -->
+</script>
diff --git a/BlogBundle/Resources/views/Elements/quickadmin.html.twig b/BlogBundle/Resources/views/Elements/quickadmin.html.twig
@@ -0,0 +1,9 @@
+<h4>Administration</h4>
+
+<ul>
+    <li><a href="{{ path('_security_login') }}">Login</a></li>
+    <li><a href="{{ path('blog_admin_dashboard') }}">Dashboard</a></li>
+    <li><a href="{{ path('blog_admin_list_authors') }}">Authors</a></li>
+    <li><a href="{{ path('blog_post_admin') }}">Posts</a>
+    <li><a href="{{ path( 'blog_post_new') }}">Create Content</a></li>
+</ul>
diff --git a/BlogBundle/Resources/views/Search/query.html.twig b/BlogBundle/Resources/views/Search/query.html.twig
@@ -1,4 +1,4 @@
-{% extends 'WhitewashingBlogBundle::layout.twig.html' %}
+{% extends '::layout.html.twig' %}
 
 {% block content %}
 <h2>Search result for "{{term}}"</h2>

diff --git a/BlogBundle/Resources/views/adminLayout.html.twig b/BlogBundle/Resources/views/adminLayout.html.twig