Skip to content
Browse files

display home page - debugged css

  • Loading branch information...
1 parent 7f0cf76 commit eccc1a502c46cf60331bc64a67fff21656dd3817 @netagora committed Jan 26, 2012
View
2 src/ECE/Bundle/NetagoraBundle/Controller/AccountController.php
@@ -45,7 +45,6 @@ public function subscribeAction(Request $request)
$em = $this->getDoctrine()->getEntityManager();
$em->persist($user);
$em->flush();
- $user->file = null;
// Send the confirmation email
$this->sendConfirmationEmail($user);
@@ -56,7 +55,6 @@ public function subscribeAction(Request $request)
return $this->redirect($this->generateUrl('home'));
}
}
- $user->file = null;
return array('form' => $form->createView());
}
View
10 src/ECE/Bundle/NetagoraBundle/Controller/ConnectedController.php
@@ -24,7 +24,15 @@ class ConnectedController extends Controller
*/
public function homeAction(Request $request)
{
- return array();
+ $em = $this->getDoctrine()->getEntityManager();
+ $user = $this->get('security.context')->getToken()->getUser();
+
+ $publications = $em
+ ->getRepository('ECENetagoraBundle:Publication')
+ ->getOtherPublications($user->getId())
+ ;
+
+ return array('publications' => $publications);
}
/**
View
4 src/ECE/Bundle/NetagoraBundle/Resources/public/css/css_body2.css
@@ -1818,8 +1818,8 @@ border: none;
border-radius: 3px;
outline: none;
padding: 5px;
-width: 500px;
-height: 200px;
+#width: 500px;
+#height: 200px;
}
form#profile input:not([type=submit]):focus,
form#profile textarea:focus,
View
296 src/ECE/Bundle/NetagoraBundle/Resources/views/Connected/home.html.twig
@@ -3,162 +3,150 @@
{% block main_content %}
<div class="body_container" id="home_co">
- <div class="body_insider">
- <div class="welcome_title">
- Welcome {{ app.user.username }}!
- </div>
-
-
- <div class="cat_container">
- <!-- START CONTAINER VIDEOS -->
- <div class="categories" id="home_videos">
- <div class="cat_title">
- Latest videos <span class="close">x</span>
- </div>
- <div class="cat_new_content">
- <div class="content">
- <div class="description">title</div>
- <div class="source"><a href="">(source)</a></div>
- </div>
- <div class="content">
- <div class="description">title</div>
- <div class="source"><a href="">(source)</a></div>
- </div>
- <div class="content">
- <div class="description">title</div>
- <div class="source"><a href="">(source)</a></div>
- </div>
- </div>
- </div>
- <!-- END CONTAINER VIDEOS -->
-
- <!-- START CONTAINER MUSIC -->
- <div class="categories" id="home_music">
- <div class="cat_title">
- Latest music <span class="close">x</span>
- </div>
- <div class="cat_new_content">
- <div class="content">
- <div class="description">title</div>
- <div class="source"><a href="">(source)</a></div>
- </div>
- <div class="content">
- <div class="description">title</div>
- <div class="source"><a href="">(source)</a></div>
- </div>
- <div class="content">
- <div class="description">title</div>
- <div class="source"><a href="">(source)</a></div>
- </div>
- </div>
- </div>
- <!-- END CONTAINER MUSIC -->
-
- <!-- START CONTAINER PICTURES -->
- <div class="categories" id="home_pictures">
- <div class="cat_title">
- Latest pictures <span class="close">x</span>
- </div>
- <div class="cat_new_content">
- <div class="content">
- <div class="description">title</div>
- <div class="source"><a href="">(source)</a></div>
- </div>
- <div class="content">
- <div class="description">title</div>
- <div class="source"><a href="">(source)</a></div>
- </div>
- </div>
- </div>
- <!-- END CONTAINER PICTURES -->
-
- <!-- START CONTAINER LOCATIONS -->
- <div class="categories" id="home_locations">
- <div class="cat_title">
- Latest locations <span class="close">x</span>
- </div>
- <div class="cat_new_content">
- <div class="content">
- <div class="description">title</div>
- <div class="source"><a href="">(source)</a></div>
- </div>
- <div class="content">
- <div class="description">title</div>
- <div class="source"><a href="">(source)</a></div>
- </div>
- </div>
- </div>
- <!-- END CONTAINER LOCATIONS -->
-
- <!-- START CONTAINER OTHERS -->
- <div class="categories" id="home_other">
- <div class="cat_title">
- Latest other <span class="close">x</span>
- </div>
- <div class="cat_new_content">
- <div class="content">
- <div class="description">title</div>
- <div class="source"><a href="">(source)</a></div>
- </div>
- <div class="content">
- <div class="description">title</div>
- <div class="source"><a href="">(source)</a></div>
- </div>
- </div>
- </div>
- <!-- END CONTAINER OTHER -->
-
- <!-- START CONTAINER FEEDS -->
- <div class="categories" id="home_feeds">
- <div class="cat_title">
- Latest feeds <span class="close">x</span>
- </div>
- <div class="cat_new_content">
- <div class="content">
- <div class="description">title</div>
- <div class="source"><a href="">(source)</a></div>
- </div>
- <div class="content">
- <div class="description">title</div>
- <div class="source"><a href="">(source)</a></div>
- </div>
- </div>
- </div>
- <!-- END CONTAINER FEEDS -->
-
- <!-- START CONTAINER FAVORITES -->
- <div class="categories" id="home_favorites">
- <div class="cat_title">
- Latest favorites <span class="close">x</span>
- </div>
- <div class="cat_new_content">
- <div class="content">
- <div class="description">title</div>
- <div class="source"><a href="">(source)</a></div>
- </div>
- <div class="content">
- <div class="description">title</div>
- <div class="source"><a href="">(source)</a></div>
- </div>
- </div>
- </div>
- <!-- END CONTAINER FAVORITES -->
-
- <!-- START CONTAINER PROFIL -->
- <div class="categories" id="home_profil">
- <div class="cat_title">
- PROFIL <span class="close">x</span>
- </div>
-
- </div>
- <!-- END CONTAINER PROFIL -->
-
- </div>
+ <div class="body_insider">
+ <div class="welcome_title">
+ Welcome {{ app.user.firstname }}!
+ </div>
- <div id="cat_missing"></div>
-
+ <div class="cat_container">
+ <!-- START CONTAINER VIDEOS -->
+ <div class="categories" id="home_videos">
+ <div class="cat_title">
+ Latest videos <span class="close">x</span>
</div>
+ <div class="cat_new_content">
+ <div class="content">
+ <div class="description">title</div>
+ <div class="source"><a href="">(source)</a></div>
+ </div>
+ <div class="content">
+ <div class="description">title</div>
+ <div class="source"><a href="">(source)</a></div>
+ </div>
+ <div class="content">
+ <div class="description">title</div>
+ <div class="source"><a href="">(source)</a></div>
+ </div>
+ </div>
+ </div>
+ <!-- END CONTAINER VIDEOS -->
+ <!-- START CONTAINER MUSIC -->
+ <div class="categories" id="home_music">
+ <div class="cat_title">
+ Latest music <span class="close">x</span>
+ </div>
+ <div class="cat_new_content">
+ <div class="content">
+ <div class="description">title</div>
+ <div class="source"><a href="">(source)</a></div>
+ </div>
+ <div class="content">
+ <div class="description">title</div>
+ <div class="source"><a href="">(source)</a></div>
+ </div>
+ <div class="content">
+ <div class="description">title</div>
+ <div class="source"><a href="">(source)</a></div>
+ </div>
+ </div>
+ </div>
+ <!-- END CONTAINER MUSIC -->
+ <!-- START CONTAINER PICTURES -->
+ <div class="categories" id="home_pictures">
+ <div class="cat_title">
+ Latest pictures <span class="close">x</span>
+ </div>
+ <div class="cat_new_content">
+ <div class="content">
+ <div class="description">title</div>
+ <div class="source"><a href="">(source)</a></div>
+ </div>
+ <div class="content">
+ <div class="description">title</div>
+ <div class="source"><a href="">(source)</a></div>
+ </div>
+ <div class="content">
+ <div class="description">title</div>
+ <div class="source"><a href="">(source)</a></div>
+ </div>
+ </div>
+ </div>
+ <!-- END CONTAINER PICTURES -->
+ <!-- START CONTAINER LOCATIONS -->
+ <div class="categories" id="home_locations">
+ <div class="cat_title">
+ Latest locations <span class="close">x</span>
+ </div>
+ <div class="cat_new_content">
+ <div class="content">
+ <div class="description">title</div>
+ <div class="source"><a href="">(source)</a></div>
+ </div>
+ <div class="content">
+ <div class="description">title</div>
+ <div class="source"><a href="">(source)</a></div>
+ </div>
+ <div class="content">
+ <div class="description">title</div>
+ <div class="source"><a href="">(source)</a></div>
+ </div>
+ </div>
+ </div>
+ <!-- END CONTAINER LOCATIONS -->
+ <!-- START CONTAINER OTHER -->
+ <div class="categories" id="home_other">
+ <div class="cat_title">
+ Latest other feeds <span class="close">x</span>
+ </div>
+ <div class="cat_new_content">
+ <div class="content">
+ <div class="description">title</div>
+ <div class="source"><a href="">(source)</a></div>
+ </div>
+ <div class="content">
+ <div class="description">title</div>
+ <div class="source"><a href="">(source)</a></div>
+ </div>
+ <div class="content">
+ <div class="description">title</div>
+ <div class="source"><a href="">(source)</a></div>
+ </div>
+ </div>
+ </div>
+ <!-- END CONTAINER OTHER -->
+ <!-- START CONTAINER FEEDS -->
+ <div class="categories" id="home_feeds">
+ <div class="cat_title">
+ Latest feeds <span class="close">x</span>
+ </div>
+ <div class="cat_new_content">
+ <div class="content">
+ <div class="description">title</div>
+ <div class="source"><a href="">(source)</a></div>
+ </div>
+ <div class="content">
+ <div class="description">title</div>
+ <div class="source"><a href="">(source)</a></div>
+ </div>
+ <div class="content">
+ <div class="description">title</div>
+ <div class="source"><a href="">(source)</a></div>
+ </div>
+ </div>
+ </div>
+ <!-- END CONTAINER FEEDS -->
+ <!-- START CONTAINER PROFIL -->
+ <div class="categories" id="home_profil">
+ <div class="cat_title">
+ PROFIL <span class="close">x</span>
+ </div>
+ </div>
+ <!-- END CONTAINER PROFIL -->
+ </div>
+
+ <!-- <div id="cat_missing"></div> -->
</div>
- </div>
+
+</div>
{% endblock %}

0 comments on commit eccc1a5

Please sign in to comment.
Something went wrong with that request. Please try again.