Changeset 1823963

Timestamp:

02/17/2018 08:31:11 PM (8 years ago)

Author:

navigationnorth

Message:

updates for v0.6.1

Location:

wp-oer/trunk

Files:

• css/resource-category-style.css (modified) (2 diffs)
• includes/init.php (modified) (3 diffs)
• includes/oer-functions.php (modified) (1 diff)
• js/back_scripts.js (modified) (1 diff)
• js/resource-category.js (modified) (2 diffs)
• oer_template/resource-subject-area.php (modified) (1 diff)
• oer_template/single-resource.php (modified) (3 diffs)
• open-educational-resources.php (modified) (2 diffs)
• readme.txt (modified) (1 diff)

wp-oer/trunk/css/resource-category-style.css

@@ -54 +54 @@
 .oer_right_featuredwpr .bx-wrapper .bx-viewport { border: medium none; box-shadow: none; left: 0px; width: 100%; overflow: hidden; position: relative; height: auto !important; }
 .oer-allftrdrsrc { width: 100%; float: left; margin: 0px; padding: 0 0 25px 0; }
-.oer-allftrdpst { float: left; margin: 0 0 25px 0; padding: 10px 0; width: 100%;}
+.oer-allftrdpst { float: left; margin: 0 0 25px 0; padding: 10px 0; width: 100%; overflow:hidden; }
 .oer-allftrdrsrc .oer-snglrsrchdng { width: 100%; float: left; margin: 0px; padding: 5px 0 10px; font-size: 25px; line-height: 25px; }
 .oer-allftrdrsrc .oer-allftrdrsrccntr { float: left; margin: 0px; padding: 0 5px 0 0; overflow: auto; height: 540px; border-top: 1px solid #c8c8c8; border-bottom: 1px solid #c8c8c8; width:100%; }
@@ -73 +73 @@
 .oer_right_featuredwpr .bx-wrapper .bx-next { background: #ccc url(../images/bxnext.png) no-repeat scroll 0 0; }
 .oer_right_featuredwpr .bx-wrapper .featuredwpr_bxslider li p { color:#444; }
+ul.featuredwpr_bxslider { visibility:hidden; height:0; }
+ul.allftrdpst_slider { visibility:hidden; height:190px; overflow:hidden; }
 .clear { clear:both; }
 #oer-content { overflow:hidden; width:100%; }

wp-oer/trunk/includes/init.php

@@ -8 +8 @@
 {
     global $pagenow;
-    
+    
     $user_id = get_current_user_id();
     
@@ -24 +24 @@
     return $args;
 }
-add_filter( 'get_terms_args', 'oer_filter_term_args', 10, 2 );
+//add_filter( 'get_terms_args', 'oer_filter_term_args', 10, 2 );
 
 //Filter Posts , Pages and Resources According Categories Assignment
@@ -388 +388 @@
             update_post_meta( $post->ID , 'oer_grade' , '');
         }
-
+        
         if(isset($_POST['oer_datecreated']))
         {

wp-oer/trunk/includes/oer-functions.php

@@ -512 +512 @@
     {
         $curr_cat = get_category_parents($id, false, '/' ,true);
+        $curr_cat = explode('/',$curr_cat);
+        
+        return $curr_cat;
+    }
+}
+
+if (!function_exists('oer_get_parent_term_list')) {
+    function oer_get_parent_term_list($id) {
+        $args = array(
+            'format' => 'name',
+            'separator' => '/',
+            'link' => false,
+            'inclusive' => false
+                  );
+        $curr_cat = get_term_parents_list($id, 'resource-subject-area', $args);
         $curr_cat = explode('/',$curr_cat);
         

wp-oer/trunk/js/back_scripts.js

@@ -1 +1 @@
 jQuery(document).ready(function(e) {
-    jQuery( ".oer_datepicker" ).datepicker();
+    jQuery( ".oer_datepicker" ).datepicker( { dateFormat: 'MM d, yy' } );
     jQuery( ".oer_datepicker" ).datepicker( "option", "showAnim", "slideDown" );
     

wp-oer/trunk/js/resource-category.js

@@ -25 +25 @@
             });
             }
+        },
+        onSliderLoad: function(currentIndex) {
+            jQuery('.featuredwpr_bxslider').css({'visibility':'visible','height':'auto'});
         }
     };
@@ -37 +40 @@
 
     jQuery('.allftrdpst_slider').bxSlider({
-        pager: false
+        pager: false,
+        onSliderLoad: function(currentIndex) {
+        jQuery('.allftrdpst_slider').css({'visibility':'visible','height':'auto'});
+        }
     });
     if (jQuery('.oer_right_featuredwpr .bx-wrapper').is(':visible')) {

wp-oer/trunk/oer_template/resource-subject-area.php

@@ -597 +597 @@
                         <div class="allftrdsngl">
                             <?php
+                            if (empty($image)) {
+                                $image = OER_URL.'images/default-icon.png';
+                            }
                             if(!empty($image)){
                                 $new_image = oer_resize_image( $image , 220 , 180 , true );

wp-oer/trunk/oer_template/single-resource.php

@@ -34 +34 @@
 if(!empty($post_terms))
 {
+    $subjects = array();
     foreach($post_terms as $term)
     {
         if($term->parent != 0)
         {
-            $parent[] = oer_get_parent_term($term->term_id);
+            $parent[] = oer_get_parent_term_list($term->term_id);
+            $subjects[] = $term;
         }
         else
@@ -45 +47 @@
         }
     }
-
+    
     if(!empty($parent) && array_filter($parent))
     {
@@ -63 +65 @@
         }
     }
+    if (count($subjects)>0)
+        $subject_areas = array_merge($subject_areas,$subjects);
 }
 

wp-oer/trunk/open-educational-resources.php

@@ -4 +4 @@
  Plugin URI:   https://www.wp-oer.com
  Description:  Open Educational Resource management and curation, metadata publishing, and alignment to Common Core State Standards.
- Version:      0.6.0
+ Version:      0.6.1
  Author:       Navigation North
  Author URI:   https://www.navigationnorth.com
@@ -37 +37 @@
 define( 'OER_PLUGIN_NAME', 'WP OER Plugin' );
 define( 'OER_ADMIN_PLUGIN_NAME', 'WP OER Plugin');
-define( 'OER_VERSION', '0.6.0' );
+define( 'OER_VERSION', '0.6.1' );
 
 include_once(OER_PATH.'includes/oer-functions.php');

wp-oer/trunk/readme.txt

@@ -42 +42 @@
 == Changelog ==
 
+= 0.6.1 =
+* improved display of featured resources on subject pages
+* display default image on Recommended Content slider if none available
+* fix saving and display of created and modified dates
+* fix taxonomy query on subject area resource lists
+
 = 0.6.0 =
 * additional keyboard accessibility fixes