mirror of
https://git.tt-rss.org/git/tt-rss.git
synced 2025-12-18 14:01:30 +00:00
Merge branch 'fix-edit-tags-onclick' of wn/tt-rss into js-objects
This commit is contained in:
@@ -633,7 +633,7 @@ class Feeds extends Handler_Protected {
|
|||||||
$tmp_content .= "<img src='images/tag.png' alt='Tags' title='Tags'>
|
$tmp_content .= "<img src='images/tag.png' alt='Tags' title='Tags'>
|
||||||
<span id=\"ATSTR-$id\">$tags_str</span>
|
<span id=\"ATSTR-$id\">$tags_str</span>
|
||||||
<a title=\"".__('Edit tags for this article')."\"
|
<a title=\"".__('Edit tags for this article')."\"
|
||||||
href=\"#\" onclick=\"Article.editArticleTags($id)\">(+)</a>";
|
href=\"#\" onclick=\"Article.editTags($id)\">(+)</a>";
|
||||||
|
|
||||||
$num_comments = (int) $line["num_comments"];
|
$num_comments = (int) $line["num_comments"];
|
||||||
$entry_comments = "";
|
$entry_comments = "";
|
||||||
|
|||||||
@@ -275,7 +275,7 @@ class Pref_Labels extends Handler_Protected {
|
|||||||
dojoType=\"dijit.MenuItem\">".__('None')."</div>";
|
dojoType=\"dijit.MenuItem\">".__('None')."</div>";
|
||||||
print "</div></div>";
|
print "</div></div>";
|
||||||
|
|
||||||
print"<button dojoType=\"dijit.form.Button\" onclick=\"return addLabel()\">".
|
print"<button dojoType=\"dijit.form.Button\" onclick=\"CommonDialogs.addLabel()\">".
|
||||||
__('Create label')."</button dojoType=\"dijit.form.Button\"> ";
|
__('Create label')."</button dojoType=\"dijit.form.Button\"> ";
|
||||||
|
|
||||||
print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('labelTree').removeSelected()\">".
|
print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('labelTree').removeSelected()\">".
|
||||||
@@ -323,4 +323,4 @@ class Pref_Labels extends Handler_Protected {
|
|||||||
print "</div>"; #container
|
print "</div>"; #container
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user