From e0a40a467d45df032d86da0e12a031b427451797 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Muszy=C5=84ski?= <rmuszynski1@gmail.com>
Date: Tue, 2 Dec 2014 11:58:50 +0100
Subject: [PATCH] change topics implementation in AES

---
 newscoop/admin-files/articles/edit.php        |  17 +-
 .../admin-files/articles/edit_topics_box.php  |  38 +--
 .../admin-files/libs/ArticleList/filters.php  | 276 +++++++++---------
 newscoop/admin-files/menu.php                 |  24 +-
 .../controllers/TopicController.php           |  11 +-
 .../library/Newscoop/Entity/ArticleTopic.php  |   7 +-
 .../Repository/ArticleTopicRepository.php     |  25 ++
 .../Entity/Repository/LanguageRepository.php  |  29 +-
 .../Entity/Repository/UserTopicRepository.php |  16 +-
 .../library/Newscoop/Entity/UserTopic.php     |  13 +-
 .../Newscoop/Services/UserTopicService.php    |  36 ++-
 .../Controller/TopicsController.php           |  14 +-
 .../Entity/Repository/TopicRepository.php     |  55 +++-
 .../Newscoop/NewscoopBundle/Entity/Topic.php  |  48 +++
 .../Resources/translations/topics.en.yml      |   1 +
 .../Resources/views/Topics/index.html.twig    |   5 +-
 16 files changed, 372 insertions(+), 243 deletions(-)
 create mode 100644 newscoop/library/Newscoop/Entity/Repository/ArticleTopicRepository.php

diff --git a/newscoop/admin-files/articles/edit.php b/newscoop/admin-files/articles/edit.php
index d7b16b9e62..c0a2e4f193 100644
--- a/newscoop/admin-files/articles/edit.php
+++ b/newscoop/admin-files/articles/edit.php
@@ -31,7 +31,7 @@
 // Whether to show comments at the bottom of the article
 // (you may not want to show them to speed up your loading time)
 // Selected language of the article
-$f_language_selected = (int)camp_session_get('f_language_selected', 0);
+$f_language_selected = (int) camp_session_get('f_language_selected', 0);
 
 if (!Input::IsValid()) {
     camp_html_display_error($translator->trans('Invalid input: $1', array('$1' => Input::GetErrorString())), $_SERVER['REQUEST_URI']);
@@ -67,7 +67,11 @@
 $lockUserObj = new User($articleObj->getLockedByUser());
 $articleCreator = new User($articleObj->getCreatorId());
 $articleEvents = ArticlePublish::GetArticleEvents($f_article_number, $f_language_selected, TRUE);
-$articleTopics = ArticleTopic::GetArticleTopics($f_article_number);
+$em = \Zend_Registry::get('container')->getService('em');
+$articleTopics = $em->getRepository("Newscoop\Entity\ArticleTopic")
+   ->getArticleTopicsQuery($f_article_number)
+   ->getResult();
+//ArticleTopic::GetArticleTopics($f_article_number);
 $articleFiles = ArticleAttachment::GetAttachmentsByArticleNumber($f_article_number, $f_language_selected);
 $articleLanguages = $articleObj->getLanguages();
 
@@ -220,7 +224,7 @@ function parseTextBody($text, $articleNumber)
 
     if (isset($imageMatches[1][0])) {
         if (isset($titles) && sizeof($titles) > 0) {
-            for($x = 0; $x < sizeof($titles[0]); $x++) {
+            for ($x = 0; $x < sizeof($titles[0]); $x++) {
                 $text = preg_replace("/\s*".preg_replace('~\/~', '\/',
                 preg_quote($titles[0][$x]))."/", ' title="'.$titles[1][$x].'"', $text);
             }
@@ -255,12 +259,13 @@ function parseTextBody($text, $articleNumber)
             print ('<script type="text/javascript">window.location.reload();</script>');
         }
     }
+
     return $text;
 }
 
 $hasMultiDates = false;
 $multiDatesFields = array();
-include_once('edit_html.php');
+include_once 'edit_html.php';
 
 // Display tinymce loading code if required
 $hasArticleBodyField = FALSE;
@@ -307,6 +312,4 @@ function parseTextBody($text, $articleNumber)
         }
     }
 
-include ("edit_javascript.php");
-
-?>
+include 'edit_javascript.php';
diff --git a/newscoop/admin-files/articles/edit_topics_box.php b/newscoop/admin-files/articles/edit_topics_box.php
index 0d50e11205..5918e14c84 100644
--- a/newscoop/admin-files/articles/edit_topics_box.php
+++ b/newscoop/admin-files/articles/edit_topics_box.php
@@ -16,8 +16,8 @@ class="input_text" value="<?php echo $articleObj->getKeywords(); ?>" onkeyup=""
       </fieldset>
     </form>
     <script type="text/javascript">
-    $(document).ready(function() {
-        $('form#article-keywords').submit(function() {
+    $(document).ready(function () {
+        $('form#article-keywords').submit(function () {
             if (!$(this).hasClass('changed')) {
                 return false;
             }
@@ -26,13 +26,14 @@ class="input_text" value="<?php echo $articleObj->getKeywords(); ?>" onkeyup=""
             callServer(['Article', 'setKeywords'], [
                 <?php echo $f_language_selected; ?>,
                 <?php echo $articleObj->getArticleNumber(); ?>,
-                keywords], function(json) {
+                keywords], function (json) {
                     flashMessage('<?php echo $translator->trans('Keywords saved.', array(), 'articles'); ?>');
                 });
 
             $(this).removeClass('changed');
+
             return false;
-        }).change(function() {
+        }).change(function () {
             $(this).addClass('changed');
         });
     });
@@ -46,33 +47,18 @@ class="ui-icon ui-icon-pencil"></span><?php echo $translator->trans('Edit'); ?><
     <?php } ?>
       <label class="left-floated block-label"><?php echo $translator->trans('Topics'); ?></label>
       <div class="clear"></div>
-    <?php if (sizeof($articleTopics) > 0) { ?>
+    <?php if (count($articleTopics) > 0) { ?>
       <ul class="block-list">
     <?php
+    $em = \Zend_Registry::get('container')->getService('em');
+    $repo = $em->getRepository("Newscoop\NewscoopBundle\Entity\Topic");
+    $language = $em->getReference("Newscoop\Entity\Language", $f_language_id);
     foreach ($articleTopics as $tmpArticleTopic) {
+        $tmpArticleTopic = $tmpArticleTopic->getTopic();
         $detachUrl = "/$ADMIN/articles/topics/do_del.php?f_article_number=$f_article_number&f_topic_id=".$tmpArticleTopic->getTopicId()."&f_language_selected=$f_language_selected&f_language_id=$f_language_id&".SecurityToken::URLParameter();
-        $path = $tmpArticleTopic->getPath();
-        $pathStr = '';
-        foreach ($path as $element) {
-            $name = $element->getName($f_language_selected);
-            if (empty($name)) {
-                // For backwards compatibility -
-                // get the english translation if the translation
-                // doesnt exist for the article's language.
-                $name = $element->getName(1);
-                if (empty($name)) {
-                    $name = '-----';
-                }
-            }
-            $pathStr .= ' / '. htmlspecialchars($name);
-        }
-
+        $pathStr = $repo->getReadablePath($tmpArticleTopic, $language->getCode());
         // Get the topic name for the 'detach topic' dialog box, below.
-        $tmpTopicName = $tmpArticleTopic->getName($f_language_selected);
-        // For backwards compatibility.
-        if (empty($tmpTopicName)) {
-            $tmpTopicName = $tmpArticleTopic->getName(1);
-        }
+        $tmpTopicName = $tmpArticleTopic->getName();
     ?>
         <li><?php p(wordwrap($pathStr, 45, '<br />&nbsp;&nbsp;')); ?>
         <?php if ($inEditMode && $g_user->hasPermission('AttachTopicToArticle')) { ?>
diff --git a/newscoop/admin-files/libs/ArticleList/filters.php b/newscoop/admin-files/libs/ArticleList/filters.php
index 9bda0e150d..279cd13838 100644
--- a/newscoop/admin-files/libs/ArticleList/filters.php
+++ b/newscoop/admin-files/libs/ArticleList/filters.php
@@ -25,16 +25,14 @@
 $issuesNo = is_array($issues) ? sizeof($issues) : 0;
 $menuIssueTitle = $issuesNo > 0 ? $translator->trans('All Issues', array(), 'library') : $translator->trans('No issues found', array(), 'library');
 
-
-
 // get sections
 $sections = array();
 $section_objects = Section::GetSections($this->publication, $this->issue, $this->language);
 
 foreach ($section_objects as $section) {
-	if (!isset($sections[$section->getSectionNumber()])) {
-		$sections[$section->getSectionNumber()] = $section;
-	}
+    if (!isset($sections[$section->getSectionNumber()])) {
+        $sections[$section->getSectionNumber()] = $section;
+    }
 }
 
 $sectionsNo = is_array($sections) ? sizeof($sections) : 0;
@@ -43,118 +41,119 @@
 ?>
 <div class="filters">
 <fieldset class="filters"><legend><?php echo $translator->trans('Filter', array(), 'library'); ?></legend> <select
-	name="publication" id="publication_filter">
-	<?php if ($publicationsNo > 0) { ?>
-	<option value="0"><?php p($menuPubTitle); ?></option>
-	<?php foreach($publications as $tmpPublication) { ?>
-	<option value="<?php echo $tmpPublication->getPublicationId(); ?>"><?php echo htmlspecialchars($tmpPublication->getName()); ?></option>
-	<?php }
-	} ?>
+    name="publication" id="publication_filter">
+    <?php if ($publicationsNo > 0) { ?>
+    <option value="0"><?php p($menuPubTitle); ?></option>
+    <?php foreach ($publications as $tmpPublication) { ?>
+    <option value="<?php echo $tmpPublication->getPublicationId(); ?>"><?php echo htmlspecialchars($tmpPublication->getName()); ?></option>
+    <?php }
+    } ?>
 </select> <select name="issue" id="issue_filter">
 <?php if ($issuesNo > 0) { ?>
-	<option value="0"><?php p($menuIssueTitle); ?></option>
-	<?php foreach($issues as $issue) { ?>
-	<option
-		value="<?php echo $issue->getPublicationId().'_'.$issue->getIssueNumber().'_'.$issue->getLanguageId(); ?>"><?php echo htmlspecialchars($issue->getName()); ?></option>
-		<?php }
+    <option value="0"><?php p($menuIssueTitle); ?></option>
+    <?php foreach ($issues as $issue) { ?>
+    <option
+        value="<?php echo $issue->getPublicationId().'_'.$issue->getIssueNumber().'_'.$issue->getLanguageId(); ?>"><?php echo htmlspecialchars($issue->getName()); ?></option>
+        <?php }
 } ?>
 </select> <select name="section" id="section_filter">
 <?php if ($sectionsNo > 0) { ?>
-	<option value="0"><?php p($menuSectionTitle); ?></option>
-	<?php foreach($sections as $section) { ?>
-	<option
-		value="<?php echo $section->getPublicationId().'_'.$section->getIssueNumber().'_'.$section->getLanguageId().'_'.$section->getSectionNumber(); ?>"><?php echo htmlspecialchars($section->getName()); ?></option>
-		<?php }
+    <option value="0"><?php p($menuSectionTitle); ?></option>
+    <?php foreach ($sections as $section) { ?>
+    <option
+        value="<?php echo $section->getPublicationId().'_'.$section->getIssueNumber().'_'.$section->getLanguageId().'_'.$section->getSectionNumber(); ?>"><?php echo htmlspecialchars($section->getName()); ?></option>
+        <?php }
 } ?>
 </select>
 
 <div class="extra">
 
 <dl>
-	<dt><label for="filter_date"><?php echo $translator->trans('Publish date', array(), 'library'); ?></label></dt>
-	<dd><input id="filter_date" type="text" name="publish_date"
-		class="date" /></dd>
+    <dt><label for="filter_date"><?php echo $translator->trans('Publish date', array(), 'library'); ?></label></dt>
+    <dd><input id="filter_date" type="text" name="publish_date"
+        class="date" /></dd>
 </dl>
 <dl>
-	<dt><label for="filter_from"><?php echo $translator->trans('Published after', array(), 'library'); ?></label></dt>
-	<dd><input id="filter_from" type="text" name="publish_date_from"
-		class="date" /></dd>
+    <dt><label for="filter_from"><?php echo $translator->trans('Published after', array(), 'library'); ?></label></dt>
+    <dd><input id="filter_from" type="text" name="publish_date_from"
+        class="date" /></dd>
 </dl>
 <dl>
-	<dt><label for="filter_to"><?php echo $translator->trans('Published before', array(), 'library'); ?></label></dt>
-	<dd><input id="filter_to" type="text" name="publish_date_to"
-		class="date" /></dd>
+    <dt><label for="filter_to"><?php echo $translator->trans('Published before', array(), 'library'); ?></label></dt>
+    <dd><input id="filter_to" type="text" name="publish_date_to"
+        class="date" /></dd>
 </dl>
 <dl>
-	<dt><label for="filter_author"><?php echo $translator->trans('Author'); ?></label></dt>
-	<dd><input type="hidden" name="author" id="filter_author" class="select2" data-placeholder="<?php echo $translator->trans('Search for authors', array(), 'authors'); ?>" data-contenturl="/admin/authors/get" /></dd>
+    <dt><label for="filter_author"><?php echo $translator->trans('Author'); ?></label></dt>
+    <dd><input type="hidden" name="author" id="filter_author" class="select2" data-placeholder="<?php echo $translator->trans('Search for authors', array(), 'authors'); ?>" data-contenturl="/admin/authors/get" /></dd>
 </dl>
 <dl>
-	<dt><label for="filter_creator"><?php echo $translator->trans('Creator', array(), 'library'); ?></label></dt>
-	<dd><input type="hidden" name="creator" id="filter_creator" class="select2" data-placeholder="<?php echo $translator->trans('Search for creators', array(), 'library'); ?>" data-contenturl="/admin/users/load" /></dd>
+    <dt><label for="filter_creator"><?php echo $translator->trans('Creator', array(), 'library'); ?></label></dt>
+    <dd><input type="hidden" name="creator" id="filter_creator" class="select2" data-placeholder="<?php echo $translator->trans('Search for creators', array(), 'library'); ?>" data-contenturl="/admin/users/load" /></dd>
 </dl>
 <dl>
-	<dt><label for="filter_status"><?php echo $translator->trans('Status'); ?></label></dt>
-	<dd><select name="workflow_status">
-		<option value=""><?php echo $translator->trans('All'); ?></option>
-		<option value="published"><?php echo $translator->trans('Published'); ?></option>
-		<option value="new"><?php echo $translator->trans('New'); ?></option>
-		<option value="submitted"><?php echo $translator->trans('Submitted'); ?></option>
-		<option value="withissue"><?php echo $translator->trans('Publish with issue'); ?></option>
-	</select></dd>
+    <dt><label for="filter_status"><?php echo $translator->trans('Status'); ?></label></dt>
+    <dd><select name="workflow_status">
+        <option value=""><?php echo $translator->trans('All'); ?></option>
+        <option value="published"><?php echo $translator->trans('Published'); ?></option>
+        <option value="new"><?php echo $translator->trans('New'); ?></option>
+        <option value="submitted"><?php echo $translator->trans('Submitted'); ?></option>
+        <option value="withissue"><?php echo $translator->trans('Publish with issue'); ?></option>
+    </select></dd>
 </dl>
 <dl>
-	<dt><label for="filter_topic"><?php echo $translator->trans('Topic'); ?></label></dt>
+    <dt><label for="filter_topic"><?php echo $translator->trans('Topic'); ?></label></dt>
     <dd><input type="hidden" name="topic" id="filter_topic" class="select2" data-placeholder="<?php echo $translator->trans('Search for topics', array(), 'topics'); ?>" data-contenturl="/admin/topics/get" /></dd>
 </dl>
 <dl>
-	<dt><label for="filter_language"><?php echo $translator->trans('Language'); ?></label></dt>
-	<dd><select id="filter_name" name="language">
-		<option value=""><?php echo $translator->trans('All'); ?></option>
-		<?php foreach(Language::GetLanguages() as $language) { ?>
-		<option value="<?php echo $language->getLanguageId(); ?>"><?php echo htmlspecialchars($language->getNativeName()); ?></option>
-		<?php } ?>
-	</select></dd>
+    <dt><label for="filter_language"><?php echo $translator->trans('Language'); ?></label></dt>
+    <dd><select id="filter_name" name="language">
+        <option value=""><?php echo $translator->trans('All'); ?></option>
+        <?php foreach (Language::GetLanguages() as $language) { ?>
+        <option value="<?php echo $language->getLanguageId(); ?>"><?php echo htmlspecialchars($language->getNativeName()); ?></option>
+        <?php } ?>
+    </select></dd>
 </dl>
 </div>
 </fieldset>
 </div>
 <!-- /.smartlist-filters -->
 
-		<?php if (!self::$renderFilters) { ?>
+        <?php if (!self::$renderFilters) { ?>
 <link type="text/css" rel="stylesheet" href="/js/select2/select2.css"></link>
 <script type="text/javascript" src="/js/select2/select2.js"></script>
 <script type="text/javascript">
 
-function handleArgs() {
-	if($('#filter_name').val() < 0) {
-		langId = 0;
-	} else {
-		langId = $('#filter_name').val();
-	}
-
-	if($('#publication_filter').val() < 0) {
-		publicationId = 0;
-	} else {
-		publicationId = $('#publication_filter').val();
-	}
-
-	if($('#issue_filter').val() < 0) {
-		issueId = 0;
-	} else {
-		issueId = $('#issue_filter').val();
-	}
-
-	args = new Array();
-	args.push({
+function handleArgs()
+{
+    if ($('#filter_name').val() < 0) {
+        langId = 0;
+    } else {
+        langId = $('#filter_name').val();
+    }
+
+    if ($('#publication_filter').val() < 0) {
+        publicationId = 0;
+    } else {
+        publicationId = $('#publication_filter').val();
+    }
+
+    if ($('#issue_filter').val() < 0) {
+        issueId = 0;
+    } else {
+        issueId = $('#issue_filter').val();
+    }
+
+    args = new Array();
+    args.push({
         'name': 'language',
         'value': langId
     });
-	args.push({
+    args.push({
         'name': 'publication',
         'value': publicationId
     });
-	args.push({
+    args.push({
         'name': 'issue',
         'value': issueId
     });
@@ -162,80 +161,80 @@ function handleArgs() {
     return args;
 }
 
-function handleFilterIssues(args) {
+function handleFilterIssues(args)
+{
+    var args = eval('(' + args + ')');
+    $('#issue_filter >option').remove();
+    $('#issue_filter').append($("<option></option>").val('0').html(args.menuItemTitle));
 
-	var args = eval('(' + args + ')');
-	$('#issue_filter >option').remove();
-	$('#issue_filter').append($("<option></option>").val('0').html(args.menuItemTitle));
-
-	var items = args.items;
-	for(var i=0; i < items.length; i++) {
-		var item = items[i];
-		$('#issue_filter').append($("<option></option>").val(item.val).html(item.name));
-	}
+    var items = args.items;
+    for (var i=0; i < items.length; i++) {
+        var item = items[i];
+        $('#issue_filter').append($("<option></option>").val(item.val).html(item.name));
+    }
 }
 
-function handleFilterSections(args) {
+function handleFilterSections(args)
+{
+    var args = eval('(' + args + ')');
+    $('#section_filter >option').remove();
+    $('#section_filter').append($("<option></option>").val('0').html(args.menuItemTitle));
 
-	var args = eval('(' + args + ')');
-	$('#section_filter >option').remove();
-	$('#section_filter').append($("<option></option>").val('0').html(args.menuItemTitle));
-
-	var items = args.items;
-	for(var i=0; i < items.length; i++) {
-		var item = items[i];
-		$('#section_filter').append($("<option></option>").val(item.val).html(item.name));
-	}
+    var items = args.items;
+    for (var i=0; i < items.length; i++) {
+        var item = items[i];
+        $('#section_filter').append($("<option></option>").val(item.val).html(item.name));
+    }
 }
 
-function refreshFilterIssues() {
-	var args = handleArgs();
-	callServer(['ArticleList', 'getFilterIssues'], args, handleFilterIssues);
+function refreshFilterIssues()
+{
+    var args = handleArgs();
+    callServer(['ArticleList', 'getFilterIssues'], args, handleFilterIssues);
 }
 
-function refreshFilterSections() {
-	var args = handleArgs();
-	callServer(['ArticleList', 'getFilterSections'], args, handleFilterSections);
+function refreshFilterSections()
+{
+    var args = handleArgs();
+    callServer(['ArticleList', 'getFilterSections'], args, handleFilterSections);
 }
 
-$(document).ready(function() {
+$(document).ready(function () {
 //handle language change first
-$('#filter_name').change(function() {
+$('#filter_name').change(function () {
 
-	refreshFilterIssues();
-	refreshFilterSections();
+    refreshFilterIssues();
+    refreshFilterSections();
 })
 
-$('#publication_filter').change(function() {
-	refreshFilterIssues();
-	refreshFilterSections();
+$('#publication_filter').change(function () {
+    refreshFilterIssues();
+    refreshFilterSections();
 })
 
-$('#issue_filter').change(function() {
-	var smartlist = $(this).closest('.smartlist');
-	var smartlistId = smartlist.attr('id').split('-')[1];
-	filters[smartlistId]['section'] = 0;
-	refreshFilterSections();
+$('#issue_filter').change(function () {
+    var smartlist = $(this).closest('.smartlist');
+    var smartlistId = smartlist.attr('id').split('-')[1];
+    filters[smartlistId]['section'] = 0;
+    refreshFilterSections();
 })
 
-
-
 // filters handle
-$('.smartlist .filters select, .smartlist .filters input').change(function() {
+$('.smartlist .filters select, .smartlist .filters input').change(function () {
     var smartlist = $(this).closest('.smartlist');
     var smartlistId = smartlist.attr('id').split('-')[1];
     var name = $(this).attr('name');
     var value = $(this).val();
     filters[smartlistId][name] = value;
-    if($(this).attr('id') == 'filter_name' || $(this).attr('id') == 'publication_filter' ) {
-		filters[smartlistId]['issue'] = 0;
-		filters[smartlistId]['section'] = 0;
-	}
+    if ($(this).attr('id') == 'filter_name' || $(this).attr('id') == 'publication_filter' ) {
+        filters[smartlistId]['issue'] = 0;
+        filters[smartlistId]['section'] = 0;
+    }
     tables[smartlistId].fnDraw(true);
+
     return false;
 });
 
-
 // datepicker for dates
 $('input.date').datepicker({
     dateFormat: 'yy-mm-dd',
@@ -243,25 +242,25 @@ function refreshFilterSections() {
 });
 
 // filters managment
-$('fieldset.filters .extra').each(function() {
+$('fieldset.filters .extra').each(function () {
     var extra = $(this);
     $('dl', extra).hide();
     $('<select class="filters"></select>')
         .appendTo(extra)
-        .each(function() { // init options
+        .each(function () { // init options
             var select = $(this);
             $('<option value=""><?php echo $translator->trans('Filter by...', array(), 'library'); ?></option>')
                 .appendTo(select);
-            $('dl dt label', extra).each(function() {
+            $('dl dt label', extra).each(function () {
                 var label = $(this).text();
                 $('<option value="'+label+'">'+label+'</option>')
                     .appendTo(select);
             });
-        }).change(function() {
+        }).change(function () {
             var select = $(this);
             var value = $(this).val();
             $(this).val('');
-            $('dl', $(this).parent()).each(function() {
+            $('dl', $(this).parent()).each(function () {
                 var label = $('label', $(this)).text();
                 var option = $('option[value="' + label + '"]', select);
                 if (label == value) {
@@ -270,7 +269,7 @@ function refreshFilterSections() {
 
                     if ($('a.detach', $(this)).length == 0) {
                         $('<a class="detach">X</a>').appendTo($('dd', $(this)))
-                            .click(function() {
+                            .click(function () {
                                 $(this).parents('dl').hide();
                                 $('input, select', $(this).parent()).val('').change();
                                 select.change();
@@ -283,7 +282,7 @@ function refreshFilterSections() {
     }); // change
 });
 
-$('fieldset.filters').each(function() {
+$('fieldset.filters').each(function () {
     var fieldset = $(this);
     var smartlist = fieldset.closest('.smartlist');
     var smartlistId = smartlist.attr('id').split('-')[1];
@@ -292,9 +291,9 @@ function refreshFilterSections() {
     var resetMsg = '<?php echo $translator->trans('Reset all filters', array(), 'library'); ?>';
     $('<a href="#" class="reset" title="'+resetMsg+'">'+resetMsg+'</a>')
         .appendTo(fieldset)
-        .click(function() {
+        .click(function () {
             // reset extra filters
-            $('.extra dl', fieldset).each(function() {
+            $('.extra dl', fieldset).each(function () {
                 $(this).hide();
                 $('select, input', $(this)).val('');
             });
@@ -307,17 +306,18 @@ function refreshFilterSections() {
             // redraw table
             filters[smartlistId] = {};
             tables[smartlistId].fnDraw(true);
+
             return false;
         });
 });
 
 // autocomplete
-$('input.select2').each(function() {
+$('input.select2').each(function () {
 
     // Default processors
     var idProcessor  = function (data) { return data.id; };
-    var resultFormatProcessor = function (data) { return data.name };
-    var selectionFormatProcessor = function (data) { return data.name; };
+    var resultFormatProcessor = function (data) { return data.title };
+    var selectionFormatProcessor = function (data) { return data.title; };
     var paramProcessor = function (term, page) { return { term: term, limit: 20 }; };
     var resultsProcessor = function (data, page) { return {results: data}; };
 
@@ -331,7 +331,7 @@ function refreshFilterSections() {
         case 'filter_topic':
             break;
         case 'filter_author':
-            idProcessor  = function (data) { return data.name; };
+            idProcessor  = function (data) { return data.title; };
             break;
         default:
             break;
@@ -348,13 +348,13 @@ function refreshFilterSections() {
         id: idProcessor,
         formatResult: resultFormatProcessor,
         formatSelection: selectionFormatProcessor,
-        formatNoMatches: function() { return "<?php echo $translator->trans('No matches.', array(), 'library'); ?>"; },
-        formatSearching: function() { return "<?php echo $translator->trans('Searching...', array(), 'library'); ?>"; },
-        formatInputTooShort: function() { return  "<?php echo $translator->trans('Minimum input of characters: $1', array('$1' => 1), 'library'); ?>"; }
+        formatNoMatches: function () { return "<?php echo $translator->trans('No matches.', array(), 'library'); ?>"; },
+        formatSearching: function () { return "<?php echo $translator->trans('Searching...', array(), 'library'); ?>"; },
+        formatInputTooShort: function () { return  "<?php echo $translator->trans('Minimum input of characters: $1', array('$1' => 1), 'library'); ?>"; }
     });
 });
 
 }); // document.ready
 
 </script>
-		<?php } ?>
+        <?php } ?>
diff --git a/newscoop/admin-files/menu.php b/newscoop/admin-files/menu.php
index f85c10077a..e966d04c5d 100644
--- a/newscoop/admin-files/menu.php
+++ b/newscoop/admin-files/menu.php
@@ -27,7 +27,7 @@
   //--></script>
 
     <?php include dirname(__FILE__) . '/html_head.php'; ?>
-    
+
     <script src="<?php echo $Campsite['WEBSITE_URL']; ?>/js/jquery/fg.menu.js" type="text/javascript"></script>
     <script src="<?php echo $Campsite['WEBSITE_URL']; ?>/js/jquery/jquery.widgets.js" type="text/javascript"></script>
     <script src="<?php echo $Campsite['WEBSITE_URL']; ?>/js/jquery/fancybox/jquery.fancybox-1.3.4.pack.js" type="text/javascript"></script>
@@ -39,11 +39,11 @@
     <link rel="stylesheet" type="text/css" href="<?php echo $Campsite['WEBSITE_URL']; ?>/js/jquery/fancybox/jquery.fancybox-1.3.4.css" />
 
     <!--[if IE 6]>
-	<style type="text/css">
-		.fg-menu-ipod .fg-menu li { width: 95%; }
-		.fg-menu-ipod .ui-widget-content { border:0; }
-	</style>
-	<![endif]-->
+    <style type="text/css">
+        .fg-menu-ipod .fg-menu li { width: 95%; }
+        .fg-menu-ipod .ui-widget-content { border:0; }
+    </style>
+    <![endif]-->
 
   <script type="text/javascript">
   <!--
@@ -57,18 +57,18 @@
     }
     <?php } ?>
     var g_admin_img = '<?php echo $Campsite["ADMIN_IMAGE_BASE_URL"]; ?>';
-    $(document).ready(function() {
+    $(document).ready(function () {
         $.datepicker.setDefaults( $.datepicker.regional['<?php echo $locale; ?>'] );
     });
     //-->
   </script>
   <script type="text/javascript">
   <!--
-  $(function(){
+  $(function () {
       // BUTTONS
       $('.fg-button').hover(
-          function(){ $(this).removeClass('fg-button-ui-state-default').addClass('fg-button-ui-state-focus'); },
-          function(){ $(this).removeClass('fg-button-ui-state-focus').addClass('fg-button-ui-state-default'); }
+          function () { $(this).removeClass('fg-button-ui-state-default').addClass('fg-button-ui-state-focus'); },
+          function () { $(this).removeClass('fg-button-ui-state-focus').addClass('fg-button-ui-state-default'); }
       );
 
       // MENUS
@@ -111,9 +111,9 @@ function(){ $(this).removeClass('fg-button-ui-state-focus').addClass('fg-button-
   //-->
   </script>
   <script type="text/javascript">
-  $(document).ready(function() {
+  $(document).ready(function () {
       var sticky_limit = 0;
-      $(window).scroll(function() {
+      $(window).scroll(function () {
           if ($('.sticky').size() == 0) {
               return false; // no sticky
           }
diff --git a/newscoop/application/controllers/TopicController.php b/newscoop/application/controllers/TopicController.php
index 0919fabd9e..b5016794aa 100755
--- a/newscoop/application/controllers/TopicController.php
+++ b/newscoop/application/controllers/TopicController.php
@@ -20,17 +20,16 @@ public function articlesAction()
 
         $language = $em->getRepository('Newscoop\Entity\Language')
             ->findOneByCode($this->_getParam('language'));
-        $topic = $em->getRepository('Newscoop\Entity\Topic')
-            ->findOneBy(array(
-                'id' => $topicId, 
-                'language' => $language->getId()
-            ));
+        $query = $em->getRepository('Newscoop\NewscoopBundle\Entity\Topic')
+            ->getSingleTopicQuery($topicId, $language->getCode());
+
+        $topic = $query->getOneOrNullResult();
 
         if (!$topic) {
             throw new \Exception('We can\'t find that topic');
         }
 
-        $gimme->topic = new \MetaTopic($topic->getTopicId());
+        $gimme->topic = new \MetaTopic($topic->getId());
         $this->view->topic = $gimme->topic;
     }
 }
diff --git a/newscoop/library/Newscoop/Entity/ArticleTopic.php b/newscoop/library/Newscoop/Entity/ArticleTopic.php
index 5ffd4376ee..04c3314736 100644
--- a/newscoop/library/Newscoop/Entity/ArticleTopic.php
+++ b/newscoop/library/Newscoop/Entity/ArticleTopic.php
@@ -13,6 +13,7 @@
  * Article topic entity
  * @ORM\Entity()
  * @ORM\Table(name="ArticleTopics")
+ * @ORM\Entity(repositoryClass="Newscoop\Entity\Repository\ArticleTopicRepository")
  */
 class ArticleTopic
 {
@@ -25,8 +26,8 @@ class ArticleTopic
 
     /**
      * @ORM\Id()
-     * @ORM\ManyToOne(targetEntity="Newscoop\Entity\Topic")
-     * @ORM\JoinColumn(name="TopicId", referencedColumnName="fk_topic_id")
+     * @ORM\ManyToOne(targetEntity="Newscoop\NewscoopBundle\Entity\Topic")
+     * @ORM\JoinColumn(name="TopicId", referencedColumnName="id")
      */
     protected $topic;
 
@@ -55,7 +56,7 @@ public function setArticle($article)
     /**
      * Get Topic
      *
-     * @return Newscoop\Entity\TopicNames
+     * @return Newscoop\NewscoopBundle\Entity\Topic
      */
     public function getTopic()
     {
diff --git a/newscoop/library/Newscoop/Entity/Repository/ArticleTopicRepository.php b/newscoop/library/Newscoop/Entity/Repository/ArticleTopicRepository.php
new file mode 100644
index 0000000000..7138b33c7c
--- /dev/null
+++ b/newscoop/library/Newscoop/Entity/Repository/ArticleTopicRepository.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * @package Newscoop
+ * @author Rafał Muszyński <rafal.muszynski@sourcefabric.org>
+ * @copyright 2014 Sourcefabric z.ú.
+ * @license http://www.gnu.org/licenses/gpl-3.0.txt
+ */
+
+namespace Newscoop\Entity\Repository;
+
+use Doctrine\ORM\EntityRepository;
+
+class ArticleTopicRepository extends EntityRepository
+{
+    public function getArticleTopicsQuery($articleNumber)
+    {
+        $queryBuilder = $this->createQueryBuilder('at')
+            ->where('at.article = :articleNumber')
+            ->setParameter('articleNumber', $articleNumber);
+
+        $query = $queryBuilder->getQuery();
+
+        return $query;
+    }
+}
diff --git a/newscoop/library/Newscoop/Entity/Repository/LanguageRepository.php b/newscoop/library/Newscoop/Entity/Repository/LanguageRepository.php
index aab822425b..2224134695 100644
--- a/newscoop/library/Newscoop/Entity/Repository/LanguageRepository.php
+++ b/newscoop/library/Newscoop/Entity/Repository/LanguageRepository.php
@@ -20,8 +20,8 @@ class LanguageRepository extends EntityRepository
     /**
      * Save language
      *
-     * @param Newscoop\Entity\Language $language
-     * @param array $values
+     * @param  Newscoop\Entity\Language $language
+     * @param  array                    $values
      * @return void
      */
     public function save(Language $language, array $values)
@@ -79,7 +79,7 @@ public function save(Language $language, array $values)
     /**
      * Delete language
      *
-     * @param int $id
+     * @param  int  $id
      * @return void
      */
     public function delete($id)
@@ -104,10 +104,23 @@ public function getLanguages()
             ->getResult();
     }
 
+    /**
+     * Get languages query
+     *
+     * @return array
+     */
+    public function getAllLanguagesQuery($order = 'asc')
+    {
+        $qb = $this->createQueryBuilder('l');
+
+        return $qb->orderBy('l.name', $order)
+            ->getQuery();
+    }
+
     /**
      * Check if in use
      *
-     * @param Language $language
+     * @param  Language $language
      * @return bool
      */
     public function isUsed(Language $language)
@@ -156,10 +169,10 @@ public function isUsed(Language $language)
      * Tries to find Language entity by string. String should be in correct
      * RFC3066bis standard.
      *
-     * @param  string $languageString Language string
-     * @param  string $languageHints  Array contianing hint to language objects
-     *                                if the language is not found on the
-     *                                specified locale string
+     * @param string $languageString Language string
+     * @param string $languageHints  Array contianing hint to language objects
+     *                               if the language is not found on the
+     *                               specified locale string
      *
      * @return \Newscoop\Entity\Language|null Returns found entity or null
      */
diff --git a/newscoop/library/Newscoop/Entity/Repository/UserTopicRepository.php b/newscoop/library/Newscoop/Entity/Repository/UserTopicRepository.php
index 51ef8d0d2f..87a953e195 100644
--- a/newscoop/library/Newscoop/Entity/Repository/UserTopicRepository.php
+++ b/newscoop/library/Newscoop/Entity/Repository/UserTopicRepository.php
@@ -9,7 +9,7 @@
 
 use Doctrine\ORM\EntityRepository;
 use Newscoop\Entity\User;
-use Newscoop\Entity\Topic;
+use Newscoop\NewscoopBundle\Entity\Topic;
 
 /**
  * User Topic Repository
@@ -28,14 +28,15 @@ public function findByUser($user)
         $em = $this->getEntityManager();
         $query = $em->createQuery('SELECT ut FROM Newscoop\Entity\UserTopic ut INNER JOIN ut.topic t WHERE ut.user = :user');
         $query->setParameter('user', $userId);
+
         return $query->getResult();
     }
 
     /**
      * Find results for user and topic
      *
-     * @param  Newscoop\Entity\User $user
-     * @param  Newscoop\Entity\Topic $topic
+     * @param Newscoop\Entity\User                 $user
+     * @param Newscoop\NewscoopBundle\Entity\Topic $topic
      *
      * @return Newscoop\Entity\UserTopic
      */
@@ -47,15 +48,16 @@ public function findByTopicAndUser(User $user, Topic $topic)
             ->from('Newscoop\Entity\UserTopic', 'ut')
             ->leftJoin('ut.user', 'u')
             ->leftJoin('ut.topic', 't')
+            ->leftJoin('t.translations', 'tt')
             ->where('u.id = :user_id')
             ->andWhere('t.id = :topic_id')
-            ->andWhere('t.language = :topic_language_id')
+            ->andWhere('tt.locale = :topic_language_id')
             ->setParameters(array(
                 'user_id' => $user->getId(),
-                'topic_id' => $topic->getTopicId(),
-                'topic_language_id' => $topic->getLanguageId(),
+                'topic_id' => $topic->getId(),
+                'topic_language_id' => $topic->getTranslatableLocale(),
             ));
 
-        return $qb->getQuery()->getResult();;
+        return $qb->getQuery()->getResult();
     }
 }
diff --git a/newscoop/library/Newscoop/Entity/UserTopic.php b/newscoop/library/Newscoop/Entity/UserTopic.php
index cf6c1cf3ef..9240e223a3 100644
--- a/newscoop/library/Newscoop/Entity/UserTopic.php
+++ b/newscoop/library/Newscoop/Entity/UserTopic.php
@@ -7,7 +7,7 @@
 
 namespace Newscoop\Entity;
 
-use Doctrine\ORM\Mapping AS ORM;
+use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Entity(repositoryClass="Newscoop\Entity\Repository\UserTopicRepository")
@@ -31,20 +31,19 @@ class UserTopic
     protected $user;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Topic")
+     * @ORM\ManyToOne(targetEntity="Newscoop\NewscoopBundle\Entity\Topic")
      * @ORM\JoinColumns({
-     *      @ORM\JoinColumn(name="topic_id", referencedColumnName="fk_topic_id"),
-     *      @ORM\JoinColumn(name="topic_language", referencedColumnName="fk_language_id")
+     *      @ORM\JoinColumn(name="topic_id", referencedColumnName="id")
      *  })
      * @var Topic
      */
     protected $topic;
 
     /**
-     * @param User $user
+     * @param User  $user
      * @param Topic $topic
      */
-    public function __construct(User $user, Topic $topic)
+    public function __construct(User $user, \Newscoop\NewscoopBundle\Entity\Topic $topic)
     {
         $this->user = $user;
         $this->topic = $topic;
@@ -67,6 +66,6 @@ public function getTopic()
      */
     public function getTopicId()
     {
-        return $this->topic->getTopicId();
+        return $this->topic->getId();
     }
 }
diff --git a/newscoop/library/Newscoop/Services/UserTopicService.php b/newscoop/library/Newscoop/Services/UserTopicService.php
index db1e7aa025..83582bd67e 100644
--- a/newscoop/library/Newscoop/Services/UserTopicService.php
+++ b/newscoop/library/Newscoop/Services/UserTopicService.php
@@ -9,7 +9,7 @@
 
 use Doctrine\ORM\EntityManager;
 use Newscoop\EventDispatcher\EventDispatcher;
-use Newscoop\Entity\Topic;
+use Newscoop\NewscoopBundle\Entity\Topic;
 use Newscoop\Entity\User;
 use Newscoop\Entity\UserTopic;
 use Newscoop\Topic\SaveUserTopicsCommand;
@@ -27,7 +27,7 @@ class UserTopicService
     protected $dispatcher;
 
     /**
-     * @param Doctrine\ORM\EntityManager $em
+     * @param Doctrine\ORM\EntityManager               $em
      * @param Newscoop\EventDispatcher\EventDispatcher $dispatcher
      */
     public function __construct(EntityManager $em, $dispatcher = null)
@@ -39,8 +39,8 @@ public function __construct(EntityManager $em, $dispatcher = null)
     /**
      * Follow topic by user
      *
-     * @param Newscoop\Entity\User $user
-     * @param Newscoop\Entity\Topic $topic
+     * @param  Newscoop\Entity\User  $user
+     * @param  Newscoop\Entity\Topic $topic
      * @return void
      */
     public function followTopic(User $user, Topic $topic)
@@ -56,8 +56,8 @@ public function followTopic(User $user, Topic $topic)
     /**
      * Unfollow topic
      *
-     * @param Newscoop\Entity\User $user
-     * @param Newscoop\Entity\Topic $topic
+     * @param  Newscoop\Entity\User                 $user
+     * @param  Newscoop\NewscoopBundle\Entity\Topic $topic
      * @return void
      */
     public function unfollowTopic(User $user, Topic $topic)
@@ -84,7 +84,7 @@ public function unfollowTopic(User $user, Topic $topic)
     /**
      * Get user topics
      *
-     * @param mixed $user
+     * @param  mixed $user
      * @return array
      */
     public function getTopics($user)
@@ -104,7 +104,7 @@ public function getTopics($user)
     /**
      * Find topic
      *
-     * @param int $id
+     * @param  int                   $id
      * @return Newscoop\Entity\Topic
      */
     public function findTopic($id)
@@ -132,7 +132,7 @@ public function findTopic($id)
     /**
      * Save user topics command
      *
-     * @param Newscoop\Topic\SaveUserTopicsCommand $command
+     * @param  Newscoop\Topic\SaveUserTopicsCommand $command
      * @return void
      */
     public function saveUserTopics(SaveUserTopicsCommand $command)
@@ -153,11 +153,9 @@ public function saveUserTopics(SaveUserTopicsCommand $command)
 
         $user = $this->em->getReference('Newscoop\Entity\User', $command->userId);
         foreach ($command->selected as $topicId) {
-            $topic = $this->em->getReference('Newscoop\Entity\Topic', array(
-                'id' => $topicId,
-                'language' => (int) $command->languageId,
-            ));
-            $this->em->persist(new UserTopic($user, $topic));
+            $language = $this->em->getReference('Newscoop\Entity\Language', $command->languageId);
+            $topic = $this->em->getRepository('Newscoop\NewscoopBundle\Entity\Topic')->getSingleTopicQuery($topicId, $language->getCode());
+            $this->em->persist(new UserTopic($user, $topic->getOneOrNullResult()));
         }
 
         $this->em->flush();
@@ -176,8 +174,8 @@ public function updateTopics(User $user, array $topics)
         $repository = $this->em->getRepository('Newscoop\Entity\UserTopic');
         $userTopics = $repository->findByUser($user);
         $matches = array();
-        foreach($userTopics as $topic){
-            if(array_key_exists($topic->getTopicId(), $topics)) {
+        foreach ($userTopics as $topic) {
+            if (array_key_exists($topic->getTopicId(), $topics)) {
                 $matches[$topic->getTopicId()] = $topic;
             }
         }
@@ -189,7 +187,7 @@ public function updateTopics(User $user, array $topics)
                         $this->em->remove($match);
                     }
                 }
-            } else if ($status === 'true' && !array_key_exists($topicId, $matches)) {
+            } elseif ($status === 'true' && !array_key_exists($topicId, $matches)) {
                 $topic = $this->findTopic($topicId);
                 if ($topic) {
                     $this->em->persist(new UserTopic($user, $this->findTopic($topicId)));
@@ -203,8 +201,8 @@ public function updateTopics(User $user, array $topics)
     /**
      * Dispatch event
      *
-     * @param Newscoop\Entity\User $user
-     * @param Newscoop\Entity\Topic $topic
+     * @param Newscoop\Entity\User                 $user
+     * @param Newscoop\NewscoopBundle\Entity\Topic $topic
      */
     private function notify(User $user, Topic $topic)
     {
diff --git a/newscoop/src/Newscoop/NewscoopBundle/Controller/TopicsController.php b/newscoop/src/Newscoop/NewscoopBundle/Controller/TopicsController.php
index 33f0735b7d..b69df4b1e6 100644
--- a/newscoop/src/Newscoop/NewscoopBundle/Controller/TopicsController.php
+++ b/newscoop/src/Newscoop/NewscoopBundle/Controller/TopicsController.php
@@ -38,8 +38,8 @@ public function getTopicsAction(Request $request)
         }
 
         $topics = $this->container->get('em')
-            ->getRepository('Newscoop\Entity\Topic')
-            ->getTopicsByName($term, $limit)
+            ->getRepository('Newscoop\NewscoopBundle\Entity\Topic')
+            ->searchTopicsQuery($term, array('title' => 'asc'), $limit)
             ->getArrayResult();
 
         return new JsonResponse($topics);
@@ -53,6 +53,16 @@ public function indexAction()
         return $this->render('NewscoopNewscoopBundle:Topics:index.html.twig');
     }
 
+    private function getClasses()
+    {
+        $em = $this->container->get('em');
+
+        return array(
+          $em->getClassMetadata('Newscoop\NewscoopBundle\Entity\Topic'),
+          $em->getClassMetadata('Newscoop\NewscoopBundle\Entity\TopicTranslation')
+        );
+    }
+
     /**
      * @Route("/admin/topics/get-languages", options={"expose"=true})
      */
diff --git a/newscoop/src/Newscoop/NewscoopBundle/Entity/Repository/TopicRepository.php b/newscoop/src/Newscoop/NewscoopBundle/Entity/Repository/TopicRepository.php
index d3a3922e23..02d548f913 100644
--- a/newscoop/src/Newscoop/NewscoopBundle/Entity/Repository/TopicRepository.php
+++ b/newscoop/src/Newscoop/NewscoopBundle/Entity/Repository/TopicRepository.php
@@ -220,11 +220,12 @@ public function saveNewTopic(Topic $node, $locale = null)
     /**
      * Gets the single topic's query by id
      *
-     * @param int $id Topic id
+     * @param int    $id     Topic id
+     * @param string $locale Language code
      *
      * @return Query $query Query object
      */
-    public function getSingleTopicQuery($id)
+    public function getSingleTopicQuery($id, $locale = null)
     {
         $meta = $this->getClassMetadata();
         $config = $this->listener->getConfiguration($this->_em, $meta->name);
@@ -237,7 +238,7 @@ public function getSingleTopicQuery($id)
 
         $query = $queryBuilder->getQuery();
 
-        return $query;
+        return $this->setTranslatableHint($query, $locale);
     }
 
     /**
@@ -329,12 +330,12 @@ public function getArticlesQueryByTopicIdAndLanguage($topicId, $languageCode, $d
      *
      * @return Query
      */
-    public function searchTopicsQuery($query, $sort = array())
+    public function searchTopicsQuery($query, $sort = array(), $limit = null)
     {
         $meta = $this->getClassMetadata();
         $config = $this->listener->getConfiguration($this->_em, $meta->name);
         $qb = $this->getQueryBuilder()
-            ->select('t')
+            ->select('t', 'tt')
             ->from($config['useObjectClass'], 't')
             ->leftJoin('t.translations', 'tt')
             ->where("tt.field = 'title'");
@@ -351,6 +352,50 @@ public function searchTopicsQuery($query, $sort = array())
             }
         }
 
+        if (!is_null($limit)) {
+            $qb->setMaxResults($limit);
+        }
+
         return $this->setTranslatableHint($qb->getQuery());
     }
+
+    /**
+     * Find topic options
+     *
+     * @return array
+     */
+    public function findOptions()
+    {
+        $query = $this->createQueryBuilder('t')
+            ->select('t.id, t.title as name')
+            ->orderBy('t.title')
+            ->getQuery();
+
+        $options = array();
+        foreach ($query->getResult() as $row) {
+            $options[$row['id']] = $row['name'];
+        }
+
+        return $options;
+    }
+
+    /**
+     * Gets topic's path
+     *
+     * @param Topic $topic Topic
+     *
+     * @return string Path of the topic
+     */
+    public function getReadablePath(Topic $topic, $locale = null)
+    {
+        $pathQuery = $this->getPathQuery($topic);
+        $this->setTranslatableHint($pathQuery, $locale);
+        $path = $pathQuery->getArrayResult();
+        $pathStr = '';
+        foreach ($path as $element) {
+            $pathStr = $pathStr . ' / ' . $element['title'];
+        }
+
+        return $pathStr;
+    }
 }
diff --git a/newscoop/src/Newscoop/NewscoopBundle/Entity/Topic.php b/newscoop/src/Newscoop/NewscoopBundle/Entity/Topic.php
index 0a542333dc..b494f5e9cb 100644
--- a/newscoop/src/Newscoop/NewscoopBundle/Entity/Topic.php
+++ b/newscoop/src/Newscoop/NewscoopBundle/Entity/Topic.php
@@ -141,6 +141,16 @@ public function getId()
         return $this->id;
     }
 
+    /**
+     * Gets the value of id.
+     *
+     * @return mixed
+     */
+    public function getTopicId()
+    {
+        return $this->id;
+    }
+
     /**
      * Sets the value of id.
      *
@@ -155,6 +165,20 @@ public function setId($id)
         return $this;
     }
 
+    /**
+     * Sets the value of id.
+     *
+     * @param mixed $id the id
+     *
+     * @return self
+     */
+    public function setTopicId($id)
+    {
+        $this->id = $id;
+
+        return $this;
+    }
+
     /**
      * Gets the value of title.
      *
@@ -179,6 +203,30 @@ public function setTitle($title)
         return $this;
     }
 
+    /**
+     * Gets the value of title.
+     *
+     * @return mixed
+     */
+    public function getName()
+    {
+        return $this->title;
+    }
+
+    /**
+     * Sets the value of title.
+     *
+     * @param mixed $title the title
+     *
+     * @return self
+     */
+    public function setName($title)
+    {
+        $this->title = $title;
+
+        return $this;
+    }
+
     /**
      * Gets the value of lft.
      *
diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/topics.en.yml b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/topics.en.yml
index d25694f003..ad204326b6 100644
--- a/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/topics.en.yml
+++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/translations/topics.en.yml
@@ -26,6 +26,7 @@ Top: Top
 'There are $1 articles using the topic.': 'There are $1 articles using the topic.'
 'Search for topics': 'Search for topics'
 topics:
+  tip: "In Newscoop, topics are the subject matters assigned by editors and journalists to articles, so that related articles can be identified and displayed together. A root topic can have many subtopics; for example: the sports root topic could have the subtopics football, basketball, and water polo. An individual article may have several root topics or subtopics assigned to it."
   label:
     all: "All"
     filterbylang: "Filter topics by language"
diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/views/Topics/index.html.twig b/newscoop/src/Newscoop/NewscoopBundle/Resources/views/Topics/index.html.twig
index 034c72d189..04bfeda1e1 100644
--- a/newscoop/src/Newscoop/NewscoopBundle/Resources/views/Topics/index.html.twig
+++ b/newscoop/src/Newscoop/NewscoopBundle/Resources/views/Topics/index.html.twig
@@ -1,7 +1,7 @@
 {% extends 'NewscoopNewscoopBundle::admin_layout.html.twig' %}
 {% trans_default_domain "topics" %}
 {% block admin_title %}{{ Newscoop['site']['title'] }} - {{ 'topics.title'|trans }}{% endblock %}
-{% block admin_page_title_content %}{{ 'newscoop.preferences.label.header'|trans }}{% endblock %}
+{% block admin_page_title_content %}{{ 'topics.title'|trans }}{% endblock %}
 {% block admin_stylesheets %}
 <link rel="stylesheet" href="{{ asset('/bundles/newscoopnewscoop/css/angular-ui-tree.min.css') }}">
 <style>
@@ -21,8 +21,7 @@
 {% block admin_content %}
 <div class="system_pref" ng-app="treeApp">
 <div class="bs-callout bs-callout-info">
-    <h4>Topics...</h4>
-    <p>Lorem ipsum dolor sit Lorem ipsum dolor sit Lorem ipsum dolor sit Lorem ipsum dolor sit Lorem ipsum dolor sit Lorem ipsum dolor sit Lorem ipsum dolor sit</p>
+{{ renderTip('topics.tip'|trans) }}
   </div>
 <div class="row" ng-controller="treeCtrl" ng-init="dim=false; highlight=true;">
         <div class="col-lg-6">