Changeset 2105404

Timestamp:

06/13/2019 09:29:58 AM (7 years ago)

Author:

sabbir1991

Message:

deploy version 2.9.17

Location:

dokan-lite/trunk

Files:

• assets/css/style.css (modified) (11 diffs)
• assets/js/dokan.js (modified) (1 diff)
• dokan.php (modified) (2 diffs)
• includes/class-theme-support.php (modified) (1 diff)
• includes/template-tags.php (modified) (2 diffs)
• includes/theme-support/class-rehub.php (added)
• languages/dokan-lite.pot (modified) (2 diffs)
• readme.txt (modified) (1 diff)
• templates/global/dashboard-nav.php (modified) (1 diff)

dokan-lite/trunk/assets/css/style.css

@@ -1932 +1932 @@
   background-color: #242424;
 }
-.dokan-dashboard .dokan-dash-sidebar #dokan-navigation ul.dokan-dashboard-menu {
+.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu {
   background: #242424;
   list-style: none;
@@ -1938 +1938 @@
   padding: 0;
 }
-.dokan-dashboard .dokan-dash-sidebar #dokan-navigation ul.dokan-dashboard-menu li {
+.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li {
   margin: 0;
   border-bottom: 1px solid #454545;
   position: relative;
 }
-.dokan-dashboard .dokan-dash-sidebar #dokan-navigation ul.dokan-dashboard-menu li a {
+.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li a {
   padding: 10px 0 10px 18px;
   display: block;
@@ -1951 +1951 @@
   text-decoration: none;
 }
-.dokan-dashboard .dokan-dash-sidebar #dokan-navigation ul.dokan-dashboard-menu li a i {
+.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li a i {
   font-size: 17px;
   padding-right: 15px;
 }
-.dokan-dashboard .dokan-dash-sidebar #dokan-navigation ul.dokan-dashboard-menu li:hover {
+.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li:hover {
   background: #f05025;
   color: #fff;
 }
-.dokan-dashboard .dokan-dash-sidebar #dokan-navigation ul.dokan-dashboard-menu li.dokan-common-links:hover {
+.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li.dokan-common-links:hover {
   background: none !important;
 }
-.dokan-dashboard .dokan-dash-sidebar #dokan-navigation ul.dokan-dashboard-menu li.dokan-common-links a {
+.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li.dokan-common-links a {
   display: inline-block !important;
   width: 33.333333%;
@@ -1969 +1969 @@
   border-right: 1px solid #454545;
 }
-.dokan-dashboard .dokan-dash-sidebar #dokan-navigation ul.dokan-dashboard-menu li.dokan-common-links a:hover {
+.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li.dokan-common-links a:hover {
   background: #f05025;
   color: #fff;
 }
-.dokan-dashboard .dokan-dash-sidebar #dokan-navigation ul.dokan-dashboard-menu li.dokan-common-links a:last-child {
+.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li.dokan-common-links a:last-child {
   border-right: none;
 }
-.dokan-dashboard .dokan-dash-sidebar #dokan-navigation ul.dokan-dashboard-menu li.active {
+.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li.active {
   position: relative;
   background: #f05025;
 }
-.dokan-dashboard .dokan-dash-sidebar #dokan-navigation ul.dokan-dashboard-menu li.active:after {
+.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li.active:after {
   left: 93%;
   top: 50%;
@@ -1994 +1994 @@
   margin-top: -16px;
 }
-.dokan-dashboard .dokan-dash-sidebar #dokan-navigation ul.dokan-dashboard-menu li ul.sub-menu {
+.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li ul.sub-menu {
   background: #fff;
   margin: 0;
@@ -2009 +2009 @@
   border-bottom: 1px solid #ECECEC;
 }
-.dokan-dashboard .dokan-dash-sidebar #dokan-navigation ul.dokan-dashboard-menu li ul.sub-menu a {
+.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li ul.sub-menu a {
   padding: 2px 0 2px 10px;
   font-size: 13px;
@@ -2015 +2015 @@
   font-weight: normal;
 }
-.dokan-dashboard .dokan-dash-sidebar #dokan-navigation ul.dokan-dashboard-menu li ul.sub-menu a:hover {
+.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li ul.sub-menu a:hover {
   background: #f37655;
   color: #fff;
 }
-.dokan-dashboard .dokan-dash-sidebar #dokan-navigation ul.dokan-dashboard-menu li ul.sub-menu li {
+.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li ul.sub-menu li {
   border-bottom: 1px solid #ccc;
 }
-.dokan-dashboard .dokan-dash-sidebar #dokan-navigation ul.dokan-dashboard-menu li ul.sub-menu li:last-child {
+.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li ul.sub-menu li:last-child {
   border-bottom: none;
 }
-.dokan-dashboard .dokan-dash-sidebar #dokan-navigation ul.dokan-dashboard-menu li.settings i.pull-right {
+.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li.settings i.pull-right {
   padding-top: 5px;
 }
@@ -2031 +2031 @@
   display: none;
 }
-#dokan-navigation > label {
-  display: block;
+.dokan-dashboard .dokan-dash-sidebar #dokan-navigation #mobile-menu-icon {
+  display: none;
+}
+.dokan-dashboard .dokan-dash-sidebar #dokan-navigation > #mobile-menu-icon {
   font-size: 17px;
   color: #fff;
@@ -2039 +2041 @@
   right: 15px;
   width: 33px;
+  z-index: 99999;
   cursor: pointer;
   -webkit-touch-callout: none;
@@ -2050 +2053 @@
   padding: 3px 8px;
 }
-#dokan-navigation > input:checked + ul.dokan-dashboard-menu {
+.dokan-dashboard .dokan-dash-sidebar #dokan-navigation > input:checked + ul.dokan-dashboard-menu {
   display: block !important;
-  clear: both;
-  top: 48px;
-  position: absolute;
   background: #000;
   color: #fff;
-  z-index: 9999;
   animation: showNav 350ms ease-in-out both;
 }
@@ -2069 +2068 @@
 }
 @media only screen and (max-width: 450px) {
-  #dokan-navigation {
-    display: #303030;
+  .dokan-dashboard .dokan-dash-sidebar #dokan-navigation {
     background: #000;
     height: 48px;
-  }
-  #dokan-navigation #toggle-mobile-menu {
-    display: block;
-  }
-  #dokan-navigation ul.dokan-dashboard-menu {
+    position: relative;
+  }
+  .dokan-dashboard .dokan-dash-sidebar #dokan-navigation #mobile-menu-icon {
+    display: block !important;
+  }
+  .dokan-dashboard .dokan-dash-sidebar #dokan-navigation #toggle-mobile-menu {
+    display: none !important;
+  }
+  .dokan-dashboard .dokan-dash-sidebar #dokan-navigation ul.dokan-dashboard-menu {
     display: none;
     height: auto !important;
+    padding-top: 48px !important;
   }
 }

dokan-lite/trunk/assets/js/dokan.js

@@ -574 +574 @@
             $('body, #dokan-product-images').on('click', 'a.add-product-images', this.gallery.addImages );
             $('body, #dokan-product-images').on( 'click', 'a.action-delete', this.gallery.deleteImage );
-            $('body, #dokan-product-images').on( 'click', 'a.delete', this.gallery.deleteImage );
             this.gallery.sortable();
 

dokan-lite/trunk/dokan.php

@@ -4 +4 @@
 Plugin URI: https://wordpress.org/plugins/dokan-lite/
 Description: An e-commerce marketplace plugin for WordPress. Powered by WooCommerce and weDevs.
-Version: 2.9.16
+Version: 2.9.17
 Author: weDevs, LLC
 Author URI: https://wedevs.com/
@@ -79 +79 @@
      * @var string
      */
-    public $version = '2.9.16';
+    public $version = '2.9.17';
 
     /**

dokan-lite/trunk/includes/class-theme-support.php

@@ -32 +32 @@
      */
     private function include_support() {
-        switch ( $this->theme ) {
-            case 'storefront':
-                require_once __DIR__ . '/theme-support/class-' . $this->theme . '.php';
-                break;
+        $themes = apply_filters( 'dokan_load_theme_support_files', [
+            'storefront',
+            'flatsome',
+            'divi',
+            'rehub'
+        ] );
 
-            case 'flatsome':
-                require_once __DIR__ . '/theme-support/class-' . $this->theme . '.php';
-                break;
-
-            case 'divi':
-                require_once __DIR__ . '/theme-support/class-' . $this->theme . '.php';
-                break;
-        }
+        return in_array( $this->theme, $themes ) ? $this->load_file( $this->theme ) : false;
     }
 
+    /**
+     * Load file classes
+     *
+     * @param string $file
+     *
+     * @since 2.9.17
+     *
+     * @return string|null on failure
+     */
+    private function load_file( $file ) {
+        $file = __DIR__ . '/theme-support/class-' . $file . '.php';
+
+        if ( ! file_exists( $file ) ) {
+            return;
+        }
+
+        require_once $file;
+    }
 }

dokan-lite/trunk/includes/template-tags.php

@@ -471 +471 @@
     }
 
-    $menu = '<ul class="dokan-dashboard-menu">';
+    $menu           = '';
+    $hamburger_menu = apply_filters( 'dokan_load_hamburger_menu', true );
+
+    if ( $hamburger_menu ) {
+        $menu .= '<div id="dokan-navigation" area-label="Menu">';
+        $menu .= '<label id="mobile-menu-icon" for="toggle-mobile-menu" aria-label="Menu">&#9776;</label>';
+        $menu .= '<input id="toggle-mobile-menu" type="checkbox" />';
+    }
+
+    $menu .= '<ul class="dokan-dashboard-menu">';
 
     foreach ( $urls as $key => $item ) {
@@ -487 +496 @@
 
     $menu .= '</ul>';
+
+    if ( $hamburger_menu ) {
+        $menu .= '</div>';
+    }
 
     return $menu;

dokan-lite/trunk/languages/dokan-lite.pot

@@ -3 +3 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Dokan 2.9.16\n"
+"Project-Id-Version: Dokan 2.9.17\n"
 "Report-Msgid-Bugs-To: https://wedevs.com/contact/\n"
-"POT-Creation-Date: 2019-06-11 03:21:00+00:00\n"
+"POT-Creation-Date: 2019-06-13 09:18:57+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -4132 +4132 @@
 msgstr ""
 
-#: includes/template-tags.php:481 templates/settings/header.php:13
+#: includes/template-tags.php:490 templates/settings/header.php:13
 #: templates/store-lists-loop.php:71
 msgid "Visit Store"
 msgstr ""
 
-#: includes/template-tags.php:482 templates/global/header-menu.php:48
+#: includes/template-tags.php:491 templates/global/header-menu.php:48
 msgid "Edit Account"
 msgstr ""
 
-#: includes/template-tags.php:483
+#: includes/template-tags.php:492
 msgid "Log out"
 msgstr ""

dokan-lite/trunk/readme.txt

@@ -275 +275 @@
 == Changelog ==
 
+v2.9.17 -> June 13, 2019
+------------------------------------
+-   **Fix***   Remove unwanted code to fix conflict with yith plugin
+-   **Tweak*** Dokan theme support and responsive menu
+
 v2.9.16 -> June 11, 2019
 ------------------------------------

dokan-lite/trunk/templates/global/dashboard-nav.php

@@ -5 +5 @@
 
 <div class="dokan-dash-sidebar">
-    <nav id="dokan-navigation" area-label="Menu">
-        <label for="toggle-mobile-menu" aria-label="Menu">&#9776;</label>
-        <input id="toggle-mobile-menu" type="checkbox" />
-
-        <?php echo dokan_dashboard_nav( $active_menu ); ?>
-    </nav>
+    <?php echo dokan_dashboard_nav( $active_menu ); ?>
 </div>