# HG changeset patch # User cavaliet # Date 1319029509 -7200 # Node ID ed54c98a7fc86afd12f659dbb414526f6298a4b9 # Parent c92424a0eb8ab9f3949025937196d85472053262 Add first files for tag list management. diff -r c92424a0eb8a -r ed54c98a7fc8 .hgignore --- a/.hgignore Wed Oct 19 14:33:40 2011 +0200 +++ b/.hgignore Wed Oct 19 15:05:09 2011 +0200 @@ -4,4 +4,6 @@ ^app/logs$ .*\.git$ syntax: regexp -^web/bundles$ \ No newline at end of file +^web/bundles$ +syntax: regexp +^app/config/parameters\.ini$ \ No newline at end of file diff -r c92424a0eb8a -r ed54c98a7fc8 .hgsubstate --- a/.hgsubstate Wed Oct 19 14:33:40 2011 +0200 +++ b/.hgsubstate Wed Oct 19 15:05:09 2011 +0200 @@ -1,1 +1,1 @@ -2dcfef6e75c3a595c77427def945d09131b8c041 vendor/bundles/IRI/Bundle/WikiTagBundle +e63ac93fdbdec47013a7edd535088547b4973e87 vendor/bundles/IRI/Bundle/WikiTagBundle diff -r c92424a0eb8a -r ed54c98a7fc8 .settings/org.eclipse.core.resources.prefs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.settings/org.eclipse.core.resources.prefs Wed Oct 19 15:05:09 2011 +0200 @@ -0,0 +1,3 @@ +#Wed Oct 19 12:37:15 CEST 2011 +eclipse.preferences.version=1 +encoding/=UTF-8 diff -r c92424a0eb8a -r ed54c98a7fc8 .settings/org.eclipse.core.runtime.prefs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.settings/org.eclipse.core.runtime.prefs Wed Oct 19 15:05:09 2011 +0200 @@ -0,0 +1,3 @@ +#Wed Oct 19 12:37:15 CEST 2011 +eclipse.preferences.version=1 +line.separator=\n diff -r c92424a0eb8a -r ed54c98a7fc8 app/Resources/FOSUserBundle/views/layout.html.twig diff -r c92424a0eb8a -r ed54c98a7fc8 app/config/parameters.ini --- a/app/config/parameters.ini Wed Oct 19 14:33:40 2011 +0200 +++ b/app/config/parameters.ini Wed Oct 19 15:05:09 2011 +0200 @@ -2,12 +2,12 @@ ; by enclosing the key with % (like %database_user%) ; Comments start with ';', as in php.ini [parameters] - database_driver = pdo_pgsql + database_driver = pdo_mysql database_host = localhost database_port = database_name = hdabo_sf - database_user = iri - database_password = iri + database_user = root + database_password = admin mailer_transport = smtp mailer_host = localhost @@ -16,4 +16,4 @@ locale = en - secret = b75610e14e21c61010093c9704754d22577 + secret = ThisTokenIsNotSoSecretChangeIt \ No newline at end of file diff -r c92424a0eb8a -r ed54c98a7fc8 src/Company/BaseBundle/Controller/IndexController.php --- a/src/Company/BaseBundle/Controller/IndexController.php Wed Oct 19 14:33:40 2011 +0200 +++ b/src/Company/BaseBundle/Controller/IndexController.php Wed Oct 19 15:05:09 2011 +0200 @@ -76,4 +76,13 @@ return $this->render('CompanyBaseBundle:Index:tag_embedder.html.twig', array('doc' => $doc)); } + /** + * Template with the list of all tags + * + */ + public function allTagsAction() + { + return $this->render('CompanyBaseBundle:Index:taglist_embedder.html.twig'); + } + } diff -r c92424a0eb8a -r ed54c98a7fc8 src/Company/BaseBundle/Resources/config/routing.yml --- a/src/Company/BaseBundle/Resources/config/routing.yml Wed Oct 19 14:33:40 2011 +0200 +++ b/src/Company/BaseBundle/Resources/config/routing.yml Wed Oct 19 15:05:09 2011 +0200 @@ -11,6 +11,9 @@ doctag: pattern: /doctag/{idDoc} defaults: { _controller: CompanyBaseBundle:Index:documentWithTag } +all_tags: + pattern: /alltags + defaults: { _controller: CompanyBaseBundle:Index:allTags } CompanyBaseBundle_document: resource: "@CompanyBaseBundle/Resources/config/routing/document.yml" diff -r c92424a0eb8a -r ed54c98a7fc8 src/Company/BaseBundle/Resources/views/Default/index.html.twig --- a/src/Company/BaseBundle/Resources/views/Default/index.html.twig Wed Oct 19 14:33:40 2011 +0200 +++ b/src/Company/BaseBundle/Resources/views/Default/index.html.twig Wed Oct 19 15:05:09 2011 +0200 @@ -1,7 +1,7 @@ {% extends 'CompanyBaseBundle::layout.html.twig' %} {% block toolbar %} -
COMPANY TOOL BAR - other url - All Documents
+
COMPANY TOOL BAR - other url - All Documents - All Tags
{% endblock %} diff -r c92424a0eb8a -r ed54c98a7fc8 src/Company/BaseBundle/Resources/views/Index/taglist_embedder.html.twig --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/Company/BaseBundle/Resources/views/Index/taglist_embedder.html.twig Wed Oct 19 15:05:09 2011 +0200 @@ -0,0 +1,20 @@ +{# example of other page extending the company base template #} +{% extends 'CompanyBaseBundle:Default:index.html.twig' %} + +{% block css_import %} +{{ parent() }} +{% render "WikiTagBundle:WikiTag:addCss" %} +{% endblock %} + +{% block js_declaration %} +{{ parent() }} +{% render "WikiTagBundle:WikiTag:addJavascript" %} +{% endblock %} + +{% block content %} +
+
+ {% render "WikiTagBundle:WikiTag:allTags" %} +
+
+{% endblock %} \ No newline at end of file