fix widgets labels & error

Author: hugosolar

assets/css/styles.css

@@ -5,7 +5,7 @@
   "main": "index.js",
   "dependencies": {},
   "devDependencies": {
-    "@creativecommons/vocabulary": "^2020.9.4",
+    "@creativecommons/vocabulary": "^2020.10.1",
     "@glidejs/glide": "^3.4.1",
     "bulma": "^0.9.1",
     "copy-webpack-plugin": "^5.1.1",

front/package.json

@@ -27,6 +27,7 @@ function form( $instance ) {
 		$vertical_space = $instance['vertical_space'];
 		echo '<p><label>Columns: </label>';
 		echo '<p><label for="' . $this->get_field_name( 'remove_gaps' ) . '">Remove gap? </label><input type="checkbox" id="' . $this->get_field_id( 'remove_gaps' ) . '"' . ( ( ! empty( $remove_gaps ) ) ? ' checked="checked" ' : '' ) . ' name="' . $this->get_field_name( 'remove_gaps' ) . '" value="1"></p>';
+		echo '<p><label>Column count: </label>';
 		echo '<select class="widefat" id="' . $this->get_field_id( 'columns' ) . '" name="' . $this->get_field_name( 'columns' ) . '">';
 		echo '<option value="">Select</option>';
 		echo '<option value="auto"' . ( ( $columns == 'auto' ) ? 'selected="selected"' : '' ) . '>Auto fit</option>';

inc/widgets/cc-columns-widgets.php

@@ -37,8 +37,8 @@ function form( $instance ) {
 		echo '<p><label>Notification format: </label>';
 		echo '<select class="widefat" id="' . $this->get_field_id( 'type' ) . '" name="' . $this->get_field_name( 'type' ) . '">';
 		echo '<option value="">Select format</option>';
-		echo '<option value="warning" ' . ( ( $type == 'warning' ) ? 'selected="selected"' : '' ) . '>Warning</option>';
-		echo '<option value="content" ' . ( ( $type == 'content' ) ? 'selected="selected"' : '' ) . '>Content</option>';
+		echo '<option value="warning" ' . ( ( $instance['type'] == 'warning' ) ? 'selected="selected"' : '' ) . '>Warning</option>';
+		echo '<option value="content" ' . ( ( $instance['type'] == 'content' ) ? 'selected="selected"' : '' ) . '>Content</option>';
 		echo '</select>';
 		echo '</p>';
 	}