servers
/
ttrss
mirror of https://tt-rss.org/git/tt-rss.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'fix-edit-tags-onclick' of wn/tt-rss into js-objects

This commit is contained in:
fox 2018-12-03 05:03:01 +00:00 committed by Gogs
parent 5ead558e43 6f9307aa9a
commit d3f31de042
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/feeds.php
View File

@ -633,7 +633,7 @@ class Feeds extends Handler_Protected {
$tmp_content .= "<img src='images/tag.png' alt='Tags' title='Tags'>
<span id=\"ATSTR-$id\">$tags_str</span>
<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"];
$entry_comments = "";

4
classes/pref/labels.php
View File

@ -275,7 +275,7 @@ class Pref_Labels extends Handler_Protected {
dojoType=\"dijit.MenuItem\">".__('None')."</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\"> ";
print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('labelTree').removeSelected()\">".
@ -323,4 +323,4 @@ class Pref_Labels extends Handler_Protected {
print "</div>"; #container
}
}
}