Merge pull request #88 from amiyasahu/version2

Updates for Version 2

CHANGELOG.md

@@ -1,6 +1,25 @@
 # Change Log
 
-## Version 1.6.3 (Latest stable version)
+## Version 2.0 (Latest stable version)
+
+* Improved wordpress integration. Now displays login and register links in the drop-down when the user is not logged in
+* Fixed PHP warning message (issue #86)
+* Fixed Issues while adding new sections to profile. (issue #66)
+* Fix the favorites page under user profile (issue #68)
+* Fixed Rendering for voting button
+* Dropped badge output from the users page, this should be taken care by the badge plugin
+* Fixed message on tags page when there are no tags available (issue #74)
+* Moved other language files to separate Github Repo
+* Removed deprecated options framework
+* Bootstrap URL https issue (issue #70)
+* Fixed micro-data issue for up-vote count (issue #61)
+* Compressed header image, saves 81% resource utilization. Page loads faster
+* Conversion text from banner's "ask" field to bundle properties (thanks to @edermfl for PR #64)
+* Dropped loading of qa-styles.css as it was not having any styling
+* Removed few unused methods, add some minor fixes and code improvements
+* Fixed the issue with homepage detection
+
+## Version 1.6.3
 
 * Used Open-sans font for better readability 
 * Used local font for supporting both http and https

README.md

@@ -4,7 +4,7 @@ Modern and Responsive theme for Question2Answer ( Q2A ) which is made for great
 
 ##### Screenshot
 
-[![Donut theme](https://raw.githubusercontent.com/amiyasahu/Donut/gh-pages/screenshots/home-page-banner.png)](https://github.com/amiyasahu/Donut)
+[![Donut theme](https://user-images.githubusercontent.com/2969035/44949562-470cf800-ae02-11e8-87cf-45072b4a88b1.png)](https://github.com/amiyasahu/Donut)
 
 ## Description
 [Donut theme][] is a free and open-source **responsive Question2Answer theme** designed for great readability with a clean interface powered by [Bootstrap](http://getbootstrap.com/). 
@@ -48,13 +48,15 @@ Also it comes with an admin panel with bunch of options to let you change nearly
 
 3. Copy the [Donut-admin][Plugin folder] folder to `qa-plugin` directory of your q2a installation (eg. `qa-plugin/Donut-admin`) 
 4. Copy the [Donut-theme][Theme folder] folder to `qa-theme` directory of your q2a installation (eg. `qa-theme/Donut-theme`)
+5. If your site language is other than English, Copy the appropriate language files from [here][Donut lang] to `qa-plugin/Donut-admin/lang` directory
 5. Visit `http://your-q2a-site.com/admin/donut-theme/general-settings` for configuring the theme as per your taste 
 6. Visit `http://your-q2a-site.com/admin/general` , select the `Donut` for both the `Site theme` and `Theme for mobile`
 7. Congratulations, Donut theme is now up and running on your website :smile:
 
 ## Contribution guidelines
 
 * Fork the [repositary][] and make improvements. Feel free to send a Pull requests
+* If you are contributing language files then please send pull request to [this repository][Donut lang]. Since Donut 2.0, this repository only will host default language files
 * Help me in testing the theme and finding the bugs 
 * Report [bugs][] here if you find any 
 * Review the code if you are a developer who loves q2a platform
@@ -86,6 +88,7 @@ This code has not been extensively tested on high-traffic installations of Q2A.
   [Install Question2Answer]: http://www.question2answer.org/install.php
   [Git]: http://git-scm.com/
   [Donut theme]: https://github.com/amiyasahu/Donut
+  [Donut lang]: https://github.com/amiyasahu/Donut-language-files
   [change log]: https://github.com/amiyasahu/Donut/blob/master/CHANGELOG.md
   [GitHub]: https://github.com/amiyasahu/Donut
   [Theme folder]: https://github.com/amiyasahu/Donut/tree/master/qa-theme/Donut-theme

qa-plugin/Donut-admin/admin/admin-panel.php

@@ -41,7 +41,6 @@
         'donut_show_home_page_banner'        => 'checkbox',
         'donut_banner_closable'              => 'checkbox',
         'donut_banner_show_ask_box'          => 'checkbox',
-        'donut_show_collapsible_btns'        => 'checkbox',
         'donut_show_breadcrumbs'             => 'checkbox',
         'donut_show_site_stats_above_footer' => 'checkbox',
         'donut_show_social_links_at_footer'  => 'checkbox',
@@ -85,7 +84,6 @@
         case 'general-settings':
             $subtitle = 'general';
             $showoptions = array( 'donut_general_settings_notice', 'donut_activate_prod_mode', 'donut_use_local_font','donut_enable_top_bar', 'donut_top_bar_left_text', 'donut_top_bar_right_text', 'donut_show_top_social_icons', 'donut_enable_sticky_header', 'donut_enable_back_to_top_btn' );
-            array_push( $showoptions, 'donut_show_collapsible_btns' );
             array_push( $showoptions, 'donut_show_custom_404_page', 'donut_custom_404_text' );
 
             array_push( $showoptions, 'donut_homepage_settings_notice', 'donut_show_home_page_banner', 'donut_banner_head_text', 'donut_banner_div1_text', 'donut_banner_div1_icon', 'donut_banner_div2_text', 'donut_banner_div2_icon', 'donut_banner_div3_text', 'donut_banner_div3_icon', 'donut_banner_show_ask_box', 'donut_banner_closable' );
@@ -288,7 +286,6 @@ function qa_optionfield_make_select( &$optionfield, $options, $value, $default )
                 case 'donut_enable_sticky_header':
                 case 'donut_enable_back_to_top_btn':
                 case 'donut_show_home_page_banner':
-                case 'donut_show_collapsible_btns':
                 case 'donut_show_breadcrumbs':
                 case 'donut_show_site_stats_above_footer':
                 case 'donut_show_social_links_at_footer':

qa-plugin/Donut-admin/lang/donut-lang-default.php

@@ -24,6 +24,7 @@
         'admin_notes'                 => 'Please visit to the `Admin/Donut theme settings` section for customizing the donut theme . Here only you can only reset the donut theme settings to its defaults',
         'ask_placeholder'             => 'Type your question',
         'ask_button'                  => 'Ask !',
+         'no_tags_message'             => 'There are no tags in your website. Tags will appear here as they are available.',
     );
 
     /*