Commit 1f7939c1 by Gideon Greenspan

1.6.1

parent 85a5f71e
1.6 1.6.1
\ No newline at end of file \ No newline at end of file
...@@ -36,7 +36,8 @@ function qa_conceal(elem, type, callback) ...@@ -36,7 +36,8 @@ function qa_conceal(elem, type, callback)
function qa_set_inner_html(elem, type, html) function qa_set_inner_html(elem, type, html)
{ {
elem.innerHTML=html; if (elem)
elem.innerHTML=html;
} }
function qa_set_outer_html(elem, type, html) function qa_set_outer_html(elem, type, html)
......
...@@ -206,7 +206,6 @@ ...@@ -206,7 +206,6 @@
if (qa_to_override(__FUNCTION__)) { $args=func_get_args(); return qa_call_override(__FUNCTION__, $args); } if (qa_to_override(__FUNCTION__)) { $args=func_get_args(); return qa_call_override(__FUNCTION__, $args); }
$fixed_defaults=array( $fixed_defaults=array(
'allow_anon_name' => 1,
'allow_change_usernames' => 1, 'allow_change_usernames' => 1,
'allow_close_questions' => 1, 'allow_close_questions' => 1,
'allow_multi_answers' => 1, 'allow_multi_answers' => 1,
......
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
*/ */
define('QA_VERSION', '1.6'); // also used as suffix for .js and .css requests define('QA_VERSION', '1.6.1'); // also used as suffix for .js and .css requests
define('QA_BUILD_DATE', '2013-06-27'); define('QA_BUILD_DATE', '2013-07-07');
// Execution section of this file - remainder contains function definitions // Execution section of this file - remainder contains function definitions
......
...@@ -1314,7 +1314,8 @@ ...@@ -1314,7 +1314,8 @@
'columns' => array( 'columns' => array(
'messageid', 'fromuserid', 'touserid', 'content', 'format', 'created' => 'UNIX_TIMESTAMP(^messages.created)', 'messageid', 'fromuserid', 'touserid', 'content', 'format', 'created' => 'UNIX_TIMESTAMP(^messages.created)',
'fromflags' => '^users.flags', 'fromlevel' => '^users.level', 'fromemail' => '^users.email', 'fromhandle' => '^users.handle', 'fromflags' => '^users.flags', 'fromlevel' => '^users.level', 'fromemail' => '^users.email', 'fromhandle' => '^users.handle',
'fromavatarblobid' => '^users.avatarblobid', 'fromavatarwidth' => '^users.avatarwidth', 'fromavatarheight' => '^users.avatarheight', 'fromavatarblobid' => 'BINARY ^users.avatarblobid', // cast to BINARY due to MySQL bug which renders it signed in a union
'fromavatarwidth' => '^users.avatarwidth', 'fromavatarheight' => '^users.avatarheight',
), ),
'source' => '^messages LEFT JOIN ^users ON fromuserid=^users.userid WHERE '.(isset($fromidentifier) 'source' => '^messages LEFT JOIN ^users ON fromuserid=^users.userid WHERE '.(isset($fromidentifier)
......
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
'points' => 'points', 'points' => 'points',
'position' => 'Position:', 'position' => 'Position:',
'posting_title' => 'Posting', 'posting_title' => 'Posting',
'profile_fields' => 'Extra fields for users:', 'profile_fields' => 'Extra fields on user pages or registration form:',
'q2a_build_date' => 'Build date:', 'q2a_build_date' => 'Build date:',
'q2a_db_size' => 'Database size:', 'q2a_db_size' => 'Database size:',
'q2a_db_version' => 'Q2A database version:', 'q2a_db_version' => 'Q2A database version:',
...@@ -213,6 +213,7 @@ ...@@ -213,6 +213,7 @@
'refill_events_note' => ' - for each user\'s list of updates', 'refill_events_note' => ' - for each user\'s list of updates',
'refill_events_refilled' => 'Refilled for ^1 of ^2 questions...', 'refill_events_refilled' => 'Refilled for ^1 of ^2 questions...',
'refill_events' => 'Refill event streams', 'refill_events' => 'Refill event streams',
'registration_fields' => 'add registration fields',
'reindex_content' => 'Reindex content', 'reindex_content' => 'Reindex content',
'reindex_content_note' => ' - for searching and related question suggestions', 'reindex_content_note' => ' - for searching and related question suggestions',
'reindex_content_stop' => 'Stop reindexing', 'reindex_content_stop' => 'Stop reindexing',
......
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
*/ */
return array( return array(
'allow_anon_name' => 'Request a name for anonymous posts:',
'allow_change_usernames' => 'Allow users with posts to change their username:', 'allow_change_usernames' => 'Allow users with posts to change their username:',
'allow_close_questions' => 'Allow questions to be manually closed:', 'allow_close_questions' => 'Allow questions to be manually closed:',
'allow_login_email_only' => 'Only log in by email address (not username):', 'allow_login_email_only' => 'Only log in by email address (not username):',
......
...@@ -171,13 +171,9 @@ ...@@ -171,13 +171,9 @@
} }
} }
if (strlen($tooltip)) $post['vote_count_tags']=@$post['vote_count_tags'].' title="'.$tooltip.'"';
$this->output('<span title="'.$tooltip.'">');
qa_html_theme_base::vote_count($post); qa_html_theme_base::vote_count($post);
if (strlen($tooltip))
$this->output('</span>');
} }
......
...@@ -134,7 +134,6 @@ ...@@ -134,7 +134,6 @@
'show_full_date_days' => 'number', 'show_full_date_days' => 'number',
'smtp_port' => 'number', 'smtp_port' => 'number',
'allow_anon_name' => 'checkbox',
'allow_change_usernames' => 'checkbox', 'allow_change_usernames' => 'checkbox',
'allow_close_questions' => 'checkbox', 'allow_close_questions' => 'checkbox',
'allow_login_email_only' => 'checkbox', 'allow_login_email_only' => 'checkbox',
...@@ -451,9 +450,6 @@ ...@@ -451,9 +450,6 @@
array_push($showoptions, 'min_len_a_content', 'min_len_c_content', 'notify_users_default'); array_push($showoptions, 'min_len_a_content', 'min_len_c_content', 'notify_users_default');
if ($maxpermitpost > QA_PERMIT_USERS)
$showoptions[]='allow_anon_name';
array_push($showoptions, '', 'block_bad_words', '', 'do_ask_check_qs', 'match_ask_check_qs', 'page_size_ask_check_qs', ''); array_push($showoptions, '', 'block_bad_words', '', 'do_ask_check_qs', 'match_ask_check_qs', 'page_size_ask_check_qs', '');
if (qa_using_tags()) if (qa_using_tags())
...@@ -1436,6 +1432,10 @@ ...@@ -1436,6 +1432,10 @@
$feedisexample=true; $feedisexample=true;
break; break;
case 'moderate_users':
$optionfield['note']='<a href="'.qa_path_html('admin/users', null, null, null, 'profile_fields').'">'.qa_lang_html('admin/registration_fields').'</a>';
break;
case 'captcha_module': case 'captcha_module':
$captchaoptions=array(); $captchaoptions=array();
...@@ -1521,6 +1521,7 @@ ...@@ -1521,6 +1521,7 @@
$qa_content['form']['fields']['userfields']=array( $qa_content['form']['fields']['userfields']=array(
'label' => qa_lang_html('admin/profile_fields'), 'label' => qa_lang_html('admin/profile_fields'),
'id' => 'profile_fields',
'style' => 'tall', 'style' => 'tall',
'type' => 'custom', 'type' => 'custom',
'html' => strlen($listhtml) ? '<ul style="margin-bottom:0;">'.$listhtml.'</ul>' : null, 'html' => strlen($listhtml) ? '<ul style="margin-bottom:0;">'.$listhtml.'</ul>' : null,
......
...@@ -1555,7 +1555,7 @@ ...@@ -1555,7 +1555,7 @@
// You can also use $post['upvotes_raw'], $post['downvotes_raw'], $post['netvotes_raw'] to get // You can also use $post['upvotes_raw'], $post['downvotes_raw'], $post['netvotes_raw'] to get
// raw integer vote counts, for graphing or showing in other non-textual ways // raw integer vote counts, for graphing or showing in other non-textual ways
$this->output('<div class="qa-vote-count '.(($post['vote_view']=='updown') ? 'qa-vote-count-updown' : 'qa-vote-count-net').'">'); $this->output('<div class="qa-vote-count '.(($post['vote_view']=='updown') ? 'qa-vote-count-updown' : 'qa-vote-count-net').'"'.@$post['vote_count_tags'].'>');
if ($post['vote_view']=='updown') { if ($post['vote_view']=='updown') {
$this->output_split($post['upvotes_view'], 'qa-upvote-count'); $this->output_split($post['upvotes_view'], 'qa-upvote-count');
......
...@@ -89,6 +89,7 @@ input[type="text"],input[type="password"],textarea,select,checkbox,radio{ ...@@ -89,6 +89,7 @@ input[type="text"],input[type="password"],textarea,select,checkbox,radio{
padding:5px; padding:5px;
color:#777; color:#777;
border-radius: 3px; border-radius: 3px;
line-height: normal;
-moz-transition:box-shadow ease-in-out 0.5s, border ease-in-out 0.5s; -moz-transition:box-shadow ease-in-out 0.5s, border ease-in-out 0.5s;
-webkit-transition:box-shadow ease-in-out 0.5s, border ease-in-out 0.5s; -webkit-transition:box-shadow ease-in-out 0.5s, border ease-in-out 0.5s;
-o-transition:box-shadow ease-in-out 0.5s, border ease-in-out 0.5s; -o-transition:box-shadow ease-in-out 0.5s, border ease-in-out 0.5s;
...@@ -98,6 +99,7 @@ input[type="text"]:focus,input[type="password"]:focus,textarea:focus{ ...@@ -98,6 +99,7 @@ input[type="text"]:focus,input[type="password"]:focus,textarea:focus{
box-shadow:0 2px 2px 0 rgba(0,0,0,0.3) inset; box-shadow:0 2px 2px 0 rgba(0,0,0,0.3) inset;
border:1px solid #00AAFF !important; border:1px solid #00AAFF !important;
color:#333; color:#333;
line-height: normal;
-moz-transition:box-shadow ease-in-out 0.2s, border ease-in-out 0.2s; -moz-transition:box-shadow ease-in-out 0.2s, border ease-in-out 0.2s;
-webkit-transition:box-shadow ease-in-out 0.2s, border ease-in-out 0.2s; -webkit-transition:box-shadow ease-in-out 0.2s, border ease-in-out 0.2s;
-o-transition:box-shadow ease-in-out 0.2s, border ease-in-out 0.2s; -o-transition:box-shadow ease-in-out 0.2s, border ease-in-out 0.2s;
...@@ -231,7 +233,7 @@ p { ...@@ -231,7 +233,7 @@ p {
#qa-userid,#qa-password,.qa-search-field{ #qa-userid,#qa-password,.qa-search-field{
width:165px; width:165px;
margin-right:5px; margin-right:5px;
height:14px; padding: 4px 5px;
} }
#qa-userid,#qa-password{ #qa-userid,#qa-password{
float:left; float:left;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment