Changeset 2427

Timestamp:

07/03/10 05:38:33 (13 years ago)

Author:

JcDenis

Message:

rateIt 2.0-alpha4

• Fixed attributes 'type' and 'style' to rateIt in templates
• Added condition for 'style' to rateItIf in templates

Location:

plugins/rateIt

Files:

• _define.php (modified) (1 diff)
• _public.php (modified) (5 diffs)
• default-templates/tpl/rateit.html (modified) (3 diffs)
• inc/lib.rateit.context.php (modified) (2 diffs)
• inc/modules/lib.rateit.module.post.public.php (modified) (1 diff)
• release.txt (modified) (1 diff)

plugins/rateIt/_define.php

@@ -17 +17 @@
      /* Description*/         "Rating system for your blogs",
      /* Author */             "JC Denis",
-     /* Version */            '2.0-alpha2',
+     /* Version */            '2.0-alpha4',
      /* Permissions */        'admin'
 );
-     /* date */          #20100625
+     /* date */          #20100703
 ?>

plugins/rateIt/_public.php

@@ -301 +301 @@
           global $core;
           
-          $style = isset($attr['style']) ? $attr['style'] : 'classic';
-          $type = isset($attr['type']) ? $attr['type'] : '';
+          $style = isset($attr['style']) ? html::escapeHTML($attr['style']) : '';
+          $type = isset($attr['type']) ? html::escapeHTML($attr['type']) : '';
           $res = '';
           
@@ -312 +312 @@
           return
           "<?php \n".
-          "if ('".$style."' == \$core->blog->settings->rateit->rateit_rating_style) { \n".
+          "\$rateit_style = \"".$style."\"; \n".
+          "if (empty(\$rateit_style)) { ".
+          " \$rateit_style = \$core->blog->settings->rateit->rateit_rating_style; ".
+          "} \n".
+          "if (empty(\$rateit_params)) { ".
+          "\$rateit_params = array('type'=>'','id'=>''); \n".
           $res.
+          "} ".
           "if (!empty(\$rateit_params['type'])) { \n".
           " \$rateit_voted = \$core->rateIt->voted(\$rateit_params['type'],\$rateit_params['id']); \n".
@@ -324 +330 @@
           "} \n".
           "unset(\$rateit_params); \n".
-          "} \n".
+          "unset(\$rateit_style); \n".
           "?> \n";
      }
@@ -352 +358 @@
                {
                     $if[] = '\''.$attr['type'].'\' == $_ctx->rateIt->type';
+               }
+          }
+          if (!empty($attr['style']))
+          {
+               if (substr($attr['style'],0,1) == '!')
+               {
+                    $if[] = '\''.substr($attr['style'],1).'\' != $rateit_style';
+               }
+               else
+               {
+                    $if[] = '\''.$attr['style'].'\' == $rateit_style';
                }
           }
@@ -388 +405 @@
           global $core;
           $f = $core->tpl->getFilters($attr);
-          return '<?php echo rateItContext::linker($rateit_voted,$_ctx->rateIt->type,$_ctx->rateIt->id,$_ctx->rateIt->note,$_ctx->rateIt->quotient); ?>';
+          return '<?php echo rateItContext::linker($rateit_voted,$_ctx->rateIt->type,$_ctx->rateIt->id,$_ctx->rateIt->note,$_ctx->rateIt->quotient,$rateit_style); ?>';
      }
      

plugins/rateIt/default-templates/tpl/rateit.html

@@ -1 +1 @@
 <tpl:rateIt>
+
+ <tpl:rateItIf style="classic">
   <div class="rateit rateit-classic">
     <h3>{{tpl:rateItTitle}}</h3>
@@ -11 +13 @@
     </ul>
   </div>
-</tpl:rateIt>
+  </tpl:rateItIf>
 
-<tpl:rateIt style="twin">
+ <tpl:rateItIf style="twin">
   <div class="rateit rateit-twin">
      <p>{{tpl:rateItMinCount}}</p>
@@ -19 +21 @@
      <p>{{tpl:rateItMaxCount}}</p>
   </div>
-</tpl:rateIt>
+ </tpl:rateItIf>
 
-<tpl:rateIt style="simple">
+ <tpl:rateItIf style="simple">
   <div class="rateit retait-simple">
      {{tpl:rateItLinker}}
      <p>{{tpl:rateItMaxCount}}</p>
   </div>
+ </tpl:rateItIf>
+
 </tpl:rateIt>

plugins/rateIt/inc/lib.rateit.context.php

@@ -16 +16 @@
 {
      # Form
-     public static function linker($enable,$type,$id,$note,$quotient)
+     public static function linker($enable,$type,$id,$note,$quotient,$style='')
      {
           global $core;
           
+          if (!in_array($style,array('classic','simple','twin')))
+          {
+               $style = $core->blog->settings->rateit->rateit_rating_style;
+          }
           $like = $core->blog->settings->rateit->rateit_msglike;
           if (empty($like)) { $like = __('I like'); }
@@ -36 +40 @@
           
           
-          if ($core->blog->settings->rateit->rateit_rating_style == 'simple')
+          if ($style == 'simple')
           {
                $chk = $enable ? ' checked="checked"' : '';
                $res .= '<input title="'.$like.'" name="'.$uid.'" class="rateit-'.$type.'-'.$id.'" type="radio" value="'.$quotient.'" '.$chk.$dis.' />';
           }
-          elseif ($core->blog->settings->rateit->rateit_rating_style == 'twin')
+          elseif ($style == 'twin')
           {
                $chk = $enable ? ' checked="checked"' : '';

plugins/rateIt/inc/modules/lib.rateit.module.post.public.php

@@ -29 +29 @@
      {
           if ($type != '' && $type != 'post') return;
-          
+//utiliser $core->getPostType      
           return 
           "if (\$_ctx->exists('posts')".

plugins/rateIt/release.txt

@@ -4 +4 @@
  - Not added public API
  - Not completed modules behaviors (delete/edit category, tag...)
+
+2.0-alpha4 20100703
+ * Fixed attributes 'type' and 'style' to rateIt in templates
+ * Added condition for 'style' to rateItIf in templates
+
+2.0-alpha3 20100701
+ * Fixed filename
 
 2.0-alpha2 20100625