Changeset 642688

Timestamp:

12/21/2012 01:30:42 AM (13 years ago)

Author:

Bit51

Message:

Updated Bit51 Library

Location:

multi-site-site-list-shortcode/trunk/lib/bit51

Files:

• bit51.css (modified) (1 diff)
• bit51.php (modified) (5 diffs)
• index.php (added)

multi-site-site-list-shortcode/trunk/lib/bit51/bit51.css

@@ -57 +57 @@
     list-style-image: url(images/bit51-small.png); 
 }
+
+table.bit51sorttable {
+    border: 1px solid #ddd;
+    padding: 0;
+}
+
+table.bit51sorttable tr,
+table.bit51sorttable td {
+    margin: 0;
+    padding: 0;
+}
+
+table.bit51sorttable tr.odd {
+    background-color: #fff;
+}
+
+table.bit51sorttable tr.even {
+    background-color: #eee;
+}
+
+table.bit51sorttable td {
+    border: 1px solid #ddd;
+}
+
+table.bit51sorttable tr.thead {
+    background: #F1F1F1;
+    background-image: -webkit-gradient(linear,left bottom,left top,from(#ECECEC),to(#F9F9F9));
+    background-image: -webkit-linear-gradient(bottom,#ECECEC,#F9F9F9);
+    background-image: -moz-linear-gradient(bottom,#ECECEC,#F9F9F9);
+    background-image: -o-linear-gradient(bottom,#ECECEC,#F9F9F9);
+    background-image: linear-gradient(to top,#ECECEC,#F9F9F9);
+}
+
+table.bit51sorttable tr td {
+    padding: 10px 5px 3px 10px;
+}
+

multi-site-site-list-shortcode/trunk/lib/bit51/bit51.php

@@ -44 +44 @@
                 wp_enqueue_style( 'global' );
                 wp_enqueue_style( 'wp-admin' );
-                wp_enqueue_style( 'bit51-css', plugin_dir_url( __FILE__ ). 'bit51.css' );
+                wp_enqueue_style( 'bit51-css', plugin_dir_url( $this->pluginbase, __FILE__ ). 'lib/bit51/bit51.css' );
                 
             }
@@ -241 +241 @@
             <?php
         }
+
+        function admin_tabs( $tabs, $current = NULL, $page = true ) {
+            if ( $current == NULL ) {
+                $current = $this->hook;
+            }
+            $tabs = $tabs;
+            echo '<div id="icon-themes" class="icon32"><br></div>';
+            echo '<h2 class="nav-tab-wrapper">';
+            foreach( $tabs as $location => $tabname ){
+                if ( is_array( $tabname ) ) {
+                    $class = ( $location == $current ) ? ' nav-tab-active' : '';
+                    echo '<a class="nav-tab' . $class. '" href="?page=' . $tabname[1] . '&tab='. $location . '">' . $tabname[0] . '</a>';
+                } else {
+                    $class = ( $location == $current ) ? ' nav-tab-active' : '';
+                    echo '<a class="nav-tab' . $class. '" href="?page=' . $location . '">' . $tabname . '</a>';
+                }
+            }
+            echo '</h2>';
+        }
         
         /**
@@ -250 +269 @@
          * @param object $boxes array of primary content boxes in postbox form
          * @param string $icon[optional] icon file to display
-         *
-         **/
-        function admin_page( $title, $boxes, $icon = '' ) {
+         * @param object $tabs[optional] array of tabs to display
+         * @param boolean $page[optional] true if stand-alone page, false otherwise
+         *
+         **/
+        function admin_page( $title, $boxes, $icon = '', $tabs = NULL, $page = true ) {
+
+            if ( ( $page != true && !isset( $_GET['tab'] ) ) || ( $page == true && isset( $_GET['tab'] ) ) ) {
+                return;
+            }
+
             ?>
                 <div class="wrap">
                     <?php if ( $icon == '' ) { ?>
-                        <a href="http://bit51.com/"><div id="bit51-icon" style="background: url(<?php echo plugin_dir_url( __FILE__ ); ?>images/bit51.png) no-repeat;" class="icon32"><br /></div></a>
+                        <a href="http://bit51.com/"><div id="bit51-icon" style="background: url(<?php echo plugin_dir_url( $this->pluginbase, __FILE__ ); ?>lib/bit51/images/bit51.png) no-repeat;" class="icon32"><br /></div></a>
                     <?php } else { ?>
                         <a href="http://bit51.com/"><div id="bit51-icon" style="background: url(<?php echo $icon; ?>) no-repeat;" class="icon32"><br /></div></a>
                     <?php } ?>
                     <h2><?php _e( $title, $this->hook ) ?></h2>
+                    <?php 
+                        if ( $tabs != NULL ) {
+                            if ( isset ( $_GET['tab'] ) ) {
+                                $this->admin_tabs( $tabs, filter_var( $_GET['tab'], FILTER_SANITIZE_STRING ), false ); 
+                            } elseif( isset( $_GET['page'] ) ) {
+                                $this->admin_tabs( $tabs, filter_var( $_GET['page'], FILTER_SANITIZE_STRING ) ); 
+                            } else { 
+                                $this->admin_tabs( $tabs ); 
+                            }
+                        }
+                    ?>
                     <div class="postbox-container" style="width:65%;">
                         <div class="metabox-holder">    
@@ -382 +419 @@
             $content .= '<li class="twitter"><a href="http://twitter.com/Bit51" target="_blank">' . __( 'Follow Bit51 on Twitter', $this->hook ) . '</a></li>';
             
-            $content .= '<li class="google"><a href="https://plus.google.com/104513012839087985497" target="_blank">' . __( 'Find Bit51 on Google+', $this->hook ) . '</a></li>';
+            $content .= '<li class="google"><a href="https://plus.google.com/104513012839087985497" target="_blank">' . __( 'Circle Bit51 on Google+', $this->hook ) . '</a></li>';
             
             $content .= '<li class="subscribe"><a href="http://bit51.com/subscribe" target="_blank">' . __( 'Subscribe with RSS or Email', $this->hook ) . '</a></li>';
@@ -417 +454 @@
             
             //display the notifcation if they haven't turned it off and they've been using the plugin at least 30 days
-            if ( ! isset( $options['no-nag'] ) && $options['activatestamp'] < ( time() - 2952000 ) ) {
+            if ( ! isset( $options['no-nag'] ) && $options['activatestamp'] < ( current_time( 'timestamp' ) - 2952000 ) ) {
             
                 if ( ! function_exists( 'bit51_plugin_donate_notice' ) ) {