Implement accordation for chart page #40

Author: contactashish13

classes/Visualizer/Render/Page/Data.php

@@ -63,8 +63,10 @@ protected function _renderSidebarContent() {
 			'chart'  => $this->chart->ID,
 		), admin_url( 'admin-ajax.php' ) );
 
-				echo '<input type="button" name="back_button" class="return-settings-btn preview-btn hidden-setting" value="&laquo; Back">';
-				echo '<div class="initial-screen">';
+		echo '<ul class="group-wrapper">';
+		echo '<li class="group">';
+		echo '<h2 class="group-title main-group">' . __( 'Chart Source', 'visualizer' ) . '</h2>';
+		echo '<ul class="group-content">';
 				echo '<iframe id="thehole" name="thehole"></iframe>';
 				echo '<p class="group-description">';
 					esc_html_e( 'Select and upload your data CSV file here. The first row of the CSV file should contain the column headings. The second one should contain series type (string, number, boolean, date, datetime, timeofday).', 'visualizer' );
@@ -76,14 +78,13 @@ protected function _renderSidebarContent() {
 					printf( esc_html__( 'or read how you can add Google spreadsheet in following %1$sarticle%1$s.', 'visualizer' ), '<a href="https://github.com/madpixelslabs/visualizer/wiki/How-can-I-populate-data-from-Google-Spreadsheet%3F" target="_blank">', '</a>' );
 				echo '</p>';
 
-				echo '<div>';
 					echo '<form id="csv-form" action="', $upload_link, '" method="post" target="thehole" enctype="multipart/form-data">';
 						echo '<input type="hidden" id="remote-data" name="remote_data">';
 						echo '<div class="form-inline">';
-						echo '<div class="button button-primary file-wrapper computer-btn">';
-							echo '<input type="file" id="csv-file" class="file" name="local_data">';
-							esc_attr_e( 'From Computer', 'visualizer' );
-						echo '</div>';
+							echo '<div class="button button-primary file-wrapper computer-btn">';
+								echo '<input type="file" id="csv-file" class="file" name="local_data">';
+								esc_attr_e( 'From Computer', 'visualizer' );
+							echo '</div>';
 
 						echo '<a id="remote-file" class="button from-web from-web-btn" href="javascript:;">', esc_html__( 'From Web', 'visualizer' ), '</a>';
 						// Added by Ash/Upwork
@@ -109,17 +110,17 @@ protected function _renderSidebarContent() {
 <?php
 		}
 
-					echo'<input type="button" name="advanced_button" class="advanced-settings-btn preview-btn" value="' . __( 'Advanced', 'visualizer' ) . ' &raquo;">';
-					// Added by Ash/Upwork
-				echo '</div>';
-			echo '</div>';
+				echo '</ul></li>';
 
-		// changed by Ash/Upwork
-		echo '<div class= "second-screen hidden-setting">';
-		echo '<form id="settings-form" action="', add_query_arg( 'nonce', wp_create_nonce() ), '" method="post">';
-		echo $this->sidebar;
-		echo '</form>';
-		echo '</div>';
+		echo '<ul class="group-wrapper">';
+		echo '<li class="group">';
+		echo '<h2 class="group-title main-group">' . __( 'Chart Settings', 'visualizer' ) . '</h2>';
+		echo '<ul class="group-content">';
+			echo '<form id="settings-form" action="', add_query_arg( 'nonce', wp_create_nonce() ), '" method="post">';
+			echo $this->sidebar;
+			echo '</form>';
+		echo '</ul></li>';
+		echo '</ul>';
 		// changed by Ash/Upwork
 	}
 

js/frame.js

@@ -110,20 +110,4 @@
 
         return $(this);
     };
-})(jQuery);
-
-//Hide / show settings in sidebar
-(function($) {
-	$(document).ready(function() {
-
-		$('.advanced-settings-btn').click(function(){
-			$('.second-screen, .return-settings-btn').removeClass("hidden-setting");
-			$('.initial-screen').addClass("hidden-setting");
-		});
-
-		$('.return-settings-btn').click(function(){
-			$('.second-screen, .return-settings-btn').addClass("hidden-setting");
-			$('.initial-screen').removeClass("hidden-setting");
-		});
-	});
-})(jQuery);
+})(jQuery);

languages/visualizer.pot

@@ -2,9 +2,9 @@
 # This file is distributed under the GPL v2.0 or later.
 msgid ""
 msgstr ""
-"Project-Id-Version: Visualizer: Charts and Graphs Lite 1.7.5\n"
+"Project-Id-Version: Visualizer: Charts and Graphs Lite 1.7.6\n"
 "Report-Msgid-Bugs-To: https://github.com/Codeinwp/visualizer/issues\n"
-"POT-Creation-Date: 2017-01-20 12:32:52+00:00\n"
+"POT-Creation-Date: 2017-02-17 13:22:15+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -172,40 +172,44 @@ msgid ""
 "its value to 1. This option increases the speed of remote CSV uploading."
 msgstr ""
 
-#: classes/Visualizer/Render/Page/Data.php:70
+#: classes/Visualizer/Render/Page/Data.php:68
+msgid "Chart Source"
+msgstr ""
+
+#: classes/Visualizer/Render/Page/Data.php:72
 msgid ""
 "Select and upload your data CSV file here. The first row of the CSV file "
 "should contain the column headings. The second one should contain series "
 "type (string, number, boolean, date, datetime, timeofday)."
 msgstr ""
 
-#: classes/Visualizer/Render/Page/Data.php:74
+#: classes/Visualizer/Render/Page/Data.php:76
 msgid ""
 "If you are unsure about how to format your data CSV then please take a look "
 "at this sample:"
 msgstr ""
 
-#: classes/Visualizer/Render/Page/Data.php:76
+#: classes/Visualizer/Render/Page/Data.php:78
 msgid "or read how you can add Google spreadsheet in following %1$sarticle%1$s."
 msgstr ""
 
-#: classes/Visualizer/Render/Page/Data.php:85
+#: classes/Visualizer/Render/Page/Data.php:86
 msgid "From Computer"
 msgstr ""
 
-#: classes/Visualizer/Render/Page/Data.php:88
+#: classes/Visualizer/Render/Page/Data.php:89
 msgid "From Web"
 msgstr ""
 
-#: classes/Visualizer/Render/Page/Data.php:107
+#: classes/Visualizer/Render/Page/Data.php:108
 msgid "Check PRO Version "
 msgstr ""
 
-#: classes/Visualizer/Render/Page/Data.php:112
-msgid "Advanced"
+#: classes/Visualizer/Render/Page/Data.php:117
+msgid "Chart Settings"
 msgstr ""
 
-#: classes/Visualizer/Render/Page/Data.php:137
+#: classes/Visualizer/Render/Page/Data.php:138
 #: classes/Visualizer/Render/Page/Settings.php:55
 msgid "Back"
 msgstr ""