Changeset 1664596

Timestamp:

05/25/2017 10:23:08 AM (9 years ago)

Author:

Studiofreya

Message:

Show warning is css-folder is not writable.

Location:

sf-bootstrap-menu/trunk

Files:

• css/style.css (modified) (1 diff)
• css/style.min.css (modified) (1 diff)
• sf-menu-widget.php (modified) (5 diffs)

sf-bootstrap-menu/trunk/css/style.css

@@ -196 +196 @@
     border-radius: 6px 0 6px 6px
 }
+
+.sf-widget-warning {
+    color:red;
+}

sf-bootstrap-menu/trunk/css/style.min.css

@@ -1 @@
-.nav-side-menu ol ol,.nav-side-menu ul ul{padding:0!important}#dynamic_menu_row .toggle-btn,.nav-side-menu .toggle-btn{display:none}.nav-side-menu li,.nav-side-menu ul{list-style:none;line-height:35px;cursor:pointer}.nav-side-menu li:not(collapsed) .arrow:before,.nav-side-menu ul:not(collapsed) .arrow:before{display:inline-block;padding-left:10px;padding-right:10px;vertical-align:middle;float:right}.nav-side-menu ul .in{background-color:#f6f6f6}.nav-side-menu ul ul.always-open{padding-left:15px!important}.nav-side-menu li .sub-menu li a{color:#505050}.nav-side-menu li .sub-menu li:hover,.nav-side-menu ul .sub-menu li:hover{background-color:#505050;color:#fff}.nav-side-menu li .sub-menu li a:hover,.nav-side-menu li li a:focus,.nav-side-menu ul .sub-menu li a:hover{color:#fff}.nav-side-menu li .sub-menu li:before,.nav-side-menu ul .sub-menu li:before{display:inline-block;padding-left:10px;padding-right:10px;vertical-align:middle}.nav-side-menu li{border-bottom:1px solid #e7e7e7}.nav-side-menu li a,.nav-side-menu li li a{padding-left:10px;text-decoration:none;color:#454545;display:inline-block;width:100%;line-height:35px}.nav-side-menu li a:focus,.nav-side-menu li a:hover,.nav-side-menu li li a:focus,.nav-side-menu li li a:hover,.nav-side-menu li:hover{color:#fff;background-color:#505050}.nav-side-menu li:hover{-webkit-transition:all 1s ease;-moz-transition:all 1s ease;-o-transition:all 1s ease;-ms-transition:all 1s ease;transition:all 1s ease}.sf-menu-caret{float:right;margin-right:10px;margin-top:12px}@media (max-width:767px){.nav-side-menu{position:relative;width:100%;margin-bottom:10px}.nav-side-menu .toggle-btn{display:block;cursor:pointer;position:absolute;right:10px;top:10px;z-index:10!important;padding:3px;background-color:#fff;color:#000;width:40px;text-align:center}.brand{text-align:left!important;font-size:22px;padding-left:20px;line-height:50px!important}}.dropdown-submenu,.nav-side-menu .open{position:relative}@media (min-width:767px){.nav-side-menu .menu-list .menu-content{display:block}}#dynamic_menu_row{border:none;border-radius:0;min-height:20px;z-index:1000;margin:0}#dynamic_menu_row .navbar-nav>li li a{padding-top:14px;padding-bottom:14px}#dynamic_menu_row li a,#dynamic_menu_row li ul li a{font-size:14px;line-height:16px}.dropdown-submenu>.dropdown-menu{top:0;left:100%;margin-top:-6px;-webkit-border-radius:0 6px 6px;-moz-border-radius:0 6px 6px;border-radius:0 6px 6px}.nav-side-menu .open>.dropdown-menu{top:35px;-webkit-border-radius:0 6px 6px;-moz-border-radius:0 6px 6px;border-radius:0 6px 6px}.dropdown-submenu:hover>.dropdown-menu{display:block}.dropdown-submenu>a:after{display:block;content:" ";float:right;width:0;height:0;border-color:transparent transparent transparent #ccc;border-style:solid;border-width:5px 0 5px 5px;margin-top:5px;margin-right:-10px}.dropdown-submenu.pull-left{float:none}.dropdown-submenu.pull-left>.dropdown-menu{left:-100%;margin-left:10px;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px}
+.nav-side-menu ol ol,.nav-side-menu ul ul{padding:0!important}#dynamic_menu_row .toggle-btn,.nav-side-menu .toggle-btn{display:none}.nav-side-menu li,.nav-side-menu ul{list-style:none;line-height:35px;cursor:pointer}.nav-side-menu li:not(collapsed) .arrow:before,.nav-side-menu ul:not(collapsed) .arrow:before{display:inline-block;padding-left:10px;padding-right:10px;vertical-align:middle;float:right}.nav-side-menu ul .in{background-color:#f6f6f6}.nav-side-menu ul ul.always-open{padding-left:15px!important}.nav-side-menu li .sub-menu li a{color:#505050}.nav-side-menu li .sub-menu li:hover,.nav-side-menu ul .sub-menu li:hover{background-color:#505050;color:#fff}.nav-side-menu li .sub-menu li a:hover,.nav-side-menu li li a:focus,.nav-side-menu ul .sub-menu li a:hover{color:#fff}.nav-side-menu li .sub-menu li:before,.nav-side-menu ul .sub-menu li:before{display:inline-block;padding-left:10px;padding-right:10px;vertical-align:middle}.nav-side-menu li{border-bottom:1px solid #e7e7e7}.nav-side-menu li a,.nav-side-menu li li a{padding-left:10px;text-decoration:none;color:#454545;display:inline-block;width:100%;line-height:35px}.nav-side-menu li a:focus,.nav-side-menu li a:hover,.nav-side-menu li li a:focus,.nav-side-menu li li a:hover,.nav-side-menu li:hover{color:#fff;background-color:#505050}.nav-side-menu li:hover{-webkit-transition:all 1s ease;-moz-transition:all 1s ease;-o-transition:all 1s ease;-ms-transition:all 1s ease;transition:all 1s ease}.sf-menu-caret{float:right;margin-right:10px;margin-top:12px}@media (max-width:767px){.nav-side-menu{position:relative;width:100%;margin-bottom:10px}.nav-side-menu .toggle-btn{display:block;cursor:pointer;position:absolute;right:10px;top:10px;z-index:10!important;padding:3px;background-color:#fff;color:#000;width:40px;text-align:center}.brand{text-align:left!important;font-size:22px;padding-left:20px;line-height:50px!important}}.dropdown-submenu,.nav-side-menu .open{position:relative}@media (min-width:767px){.nav-side-menu .menu-list .menu-content{display:block}}#dynamic_menu_row{border:none;border-radius:0;min-height:20px;z-index:1000;margin:0}#dynamic_menu_row .navbar-nav>li li a{padding-top:14px;padding-bottom:14px}#dynamic_menu_row li a,#dynamic_menu_row li ul li a{font-size:14px;line-height:16px}.dropdown-submenu>.dropdown-menu{top:0;left:100%;margin-top:-6px;-webkit-border-radius:0 6px 6px;-moz-border-radius:0 6px 6px;border-radius:0 6px 6px}.nav-side-menu .open>.dropdown-menu{top:35px;-webkit-border-radius:0 6px 6px;-moz-border-radius:0 6px 6px;border-radius:0 6px 6px}.dropdown-submenu:hover>.dropdown-menu{display:block}.dropdown-submenu>a:after{display:block;content:" ";float:right;width:0;height:0;border-color:transparent transparent transparent #ccc;border-style:solid;border-width:5px 0 5px 5px;margin-top:5px;margin-right:-10px}.dropdown-submenu.pull-left{float:none}.dropdown-submenu.pull-left>.dropdown-menu{left:-100%;margin-left:10px;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px}.sf-widget-warning{color:red}

sf-bootstrap-menu/trunk/sf-menu-widget.php

@@ -350 +350 @@
     $known_params = $this->known_params();
     unset($instance['menu_order']);
+    unset($instance['error']);
     
     foreach ($known_params as $param) {
       $instance[$param] = strip_tags(stripslashes($new_instance[$param]));
       
-      if($param == 'items_color' 
+      if($new_instance[$param] && $new_instance[$param]['value'] && ($param == 'items_color' 
         || $param == 'title_color'
         || $param == 'title_font'
@@ -360 +361 @@
         || $param == 'items_font'
         || $param == 'items_active'
-        || $param == 'items_active_font') {
+        || $param == 'items_active_font')) {
         $instance[$param]['value'] = $new_instance[$param]['value'];
       }
@@ -371 +372 @@
     $instance['sort_order'] = strtolower($instance['sort_order']) == 'desc'?'DESC':'ASC';
     
-    $this->generateDynamicCss($instance);
+    $instance = $this->generateDynamicCss($instance);
      
     return $instance;
@@ -383 +384 @@
     if ( $result === false )
     {
-       $instance['error'] = "Could not save dynamic css file.";
-    }
+       $instance['error'] = "Could not save dynamic css file into path $path";
+    }
+    
+    if(!is_writable($path)) {
+        $instance['error'] = "Could not save dynamic css file. Required plugin path ($path) is not writable. We need it to store dynamic CSS file.";
+    }
+    
+    return $instance;
   }
   
@@ -490 +497 @@
 
     if(isset($instance['error'])){
+        echo "<div class='sf-widget-warning'>";
         echo $instance['error'];
+        echo "</div>";
     }
   }