harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

turn off categories feature by default

Browse Source
This commit is contained in:
friendica 2012-11-03 16:51:29 -07:00
parent ece59b778e
commit f55636aeb6
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/contact_widgets.php
View File

@ -104,8 +104,11 @@ function fileas_widget($baseurl,$selected = '') {
} }
function categories_widget($baseurl,$selected = '') { function categories_widget($baseurl,$selected = '') {
$a = get_app();
if(! featured_enabled($a->profile['profile_uid'],'categories'))
return '';
$a = get_app();
$terms = array(); $terms = array();
$r = q("select distinct(term) from term where uid = %d and type = %d order by term asc", $r = q("select distinct(term) from term where uid = %d and type = %d order by term asc",

3
include/conversation.php
View File

@ -1684,6 +1684,8 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
$jotplugins = ''; $jotplugins = '';
$jotnets = ''; $jotnets = '';
$catsenabled = feature_enabled($x['profile_uid'],'categories');
call_hooks('jot_tool', $jotplugins); call_hooks('jot_tool', $jotplugins);
call_hooks('jot_networks', $jotnets); call_hooks('jot_networks', $jotnets);
@ -1712,6 +1714,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
'$shortnoloc' => t('clear location'), '$shortnoloc' => t('clear location'),
'$title' => "", '$title' => "",
'$placeholdertitle' => t('Set title'), '$placeholdertitle' => t('Set title'),
'$catsenabled' => $catsenabled,
'$category' => "", '$category' => "",
'$placeholdercategory' => t('Categories (comma-separated list)'), '$placeholdercategory' => t('Categories (comma-separated list)'),
'$wait' => t('Please wait'), '$wait' => t('Please wait'),

2
view/tpl/jot.tpl
View File

@ -15,7 +15,9 @@
<input type="hidden" name="post_id" value="$post_id" /> <input type="hidden" name="post_id" value="$post_id" />
<input type="hidden" name="preview" id="jot-preview" value="0" /> <input type="hidden" name="preview" id="jot-preview" value="0" />
<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div> <div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div>
{{ if $catsenabled }}
<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div> <div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>
{{ endif }}
<div id="jot-text-wrap"> <div id="jot-text-wrap">
<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea> <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>