Changeset 1032

Timestamp:

03/08/09 00:00:27 (3 years ago)

Author:

diana.kelerman@…

Message:

Paginator at the end of wiki page comments + remotebox refactoring:
moved the comments stuff from RemoteBox_Load to RemoteBox_Comments.

Location:

trunk

Files:

• smf/SSI.php (modified) (4 diffs)
• smf/ia_comments.php (modified) (1 diff)
• www/macros/macro_remotebox.php (modified) (2 diffs)
• www/macros/macro_smfcomments.php (modified) (2 diffs)
• www/macros/macro_smftopic.php (modified) (1 diff)
• www/macros/macro_smftopics.php (modified) (1 diff)
• www/static/js/remotebox.js (modified) (3 diffs)
• www/views/blog_view.php (modified) (1 diff)
• www/views/textblock_view.php (modified) (1 diff)

trunk/smf/SSI.php

@@ -243 +243 @@
 
         echo '<a href="', $scripturl, '?action=logout;sesc=', $sc, '">', $txt[108], '</a>';
+}
+
+function ssi_displayPaging($count_comm, $begin_comm, $max_comm, $display)
+{
+    if($count_comm > $max_comm) {
+        echo '<b>Mergi la pagina:</b> ';
+        for ($i = 1; $i <= $count_comm; $i += $max_comm) {
+            if ($i != $begin_comm) {
+                echo '<a href="javascript:stay()" onclick="RemoteBox_Comments('. $i .', '. $max_comm .', true, \''. $display .'\');">
+                    ['. (int)(($i + $max_comm - 1) / $max_comm) . ']</a> ';
+            } else {
+                echo '<b>[' . (int)(($i + $max_comm - 1)/ $max_comm) . ']</b> ';
+            }
+        }
+    }
 }
 
@@ -326 +341 @@
         <div class="comments">';
 
+    $remotebox_display = ($display == 'show' ? 'hide' : 'show');
     echo '
-        <a href="javascript:stay()" onclick="RemoteBox_Display = (RemoteBox_Display == \'show\' ? \'hide\' : \'show\'); RemoteBox_Load();"><h3>&#187; ';
+        <a href="javascript:stay()" onclick="RemoteBox_Comments('. $begin_comm .', '. $max_comm .', false, \''. $remotebox_display .'\');"><h3>&#187; ';
 
     if (0 == $count_comm){
@@ -343 +359 @@
     if($display == 'show') {
 
-        // Pagination
-        if($count_comm > $max_comm) {
-            echo '<b>Mergi la pagina:</b> ';
-            for ($i = 1; $i <= $count_comm; $i += $max_comm) {
-                if ($i != $begin_comm) {
-                    echo '<a href="javascript:stay()" onclick="RemoteBox_BeginComm=' . $i . ';RemoteBox_Load();">[' . (int)(($i + $max_comm - 1) / $max_comm) . ']</a> ';
-                } else {
-                    echo '<b>[' . (int)(($i + $max_comm - 1)/ $max_comm) . ']</b> ';
-                }
-            }
-        }
+        // Front paging display
+        ssi_displayPaging($count_comm, $begin_comm, $max_comm, $display);
 
         foreach ($posts as $post)
@@ -369 +376 @@
                     </div>
                 </div>';
+
+        // Back paging display
+        echo '<br>';
+        ssi_displayPaging($count_comm, $begin_comm, $max_comm, $display);
     }
 

trunk/smf/ia_comments.php

@@ -7 +7 @@
 $topic_id = getattr($_GET, 'topic_id');
 $display = getattr($_GET, 'display', 'hide');
-$begin_comm = (int)getattr($_GET, 'begin_comm', '0');
+$begin_comm = (int)getattr($_GET, 'begin_comm', '1');
 $max_comm = getattr($_GET, 'max_comm');
 

trunk/www/macros/macro_remotebox.php

@@ -9 +9 @@
 // NOTE: This macro requires special user permissions since it poses quite
 // a few security concerns.
-function macro_remotebox($args, $bypass_security = false) {
-    $url = getattr($args, 'url');
-
+function macro_remotebox($url, $bypass_security = false) {
     if (!$bypass_security && !identity_can('macro-remotebox')) {
         return macro_permission_error();
@@ -23 +21 @@
     $buffer .= '<div id="remotebox">remote content</div>';
     $buffer .= '<script type="text/javascript">RemoteBox_Url="';
-    $buffer .= html_escape($args['url']);
-    if (array_key_exists('display', $args)) {
-        $buffer .= '";RemoteBox_Display="' . html_escape($args['display']);
-    }
-    if (array_key_exists('max_comm', $args)) {
-        $buffer .= '";RemoteBox_MaxComm="' . html_escape((int)$args['max_comm']);
-    }
+    $buffer .= html_escape($url);
     $buffer .= '";</script>';
 

trunk/www/macros/macro_smfcomments.php

@@ -15 +15 @@
 //      SmfComments( topic_id="400" display="hide" max_comm="5")
 function macro_smfcomments($args) {
+    $comments = '<div id="comentarii">';
+
     $topic_id = getattr($args, 'topic_id');
     $display = getattr($args, 'display');
@@ -31 +33 @@
     }
 
-    $args = array(
-        'url' => IA_SMF_URL.'/ia_comments.php?topic_id='.$topic_id,
-        'display' => $display
-    );
     if(!is_null($max_comm)) {
-        if(is_whole_number($max_comm)) {
-            $args['max_comm'] = $max_comm;
-        } else {
+        if(!is_whole_number($max_comm)) {
             return macro_error('Wrong value for argument `max_comm`');
         }
     }
 
-    return macro_remotebox($args, true);
+    $url = IA_SMF_URL . '/ia_comments.php?topic_id=' . $topic_id . '&display=' . $display;
+    if (!is_null($max_comm)) {
+        $url .= '&max_comm=' . $max_comm;
+    }
+
+    $comments .= macro_remotebox($url, true);
+    $comments .= '</div>';
+
+    return $comments;
 }
 

trunk/www/macros/macro_smftopic.php

@@ -23 +23 @@
     }
 
-    $args = array(
-        'url' => IA_SMF_URL.'/ia_recentposts.php?topic_id='.$topic_id.'&count='.$count
-    );
-    return macro_remotebox($args, true);
+    $url = IA_SMF_URL.'/ia_recentposts.php?topic_id='.$topic_id.'&count='.$count;
+
+    return macro_remotebox($url, true);
 }
 

trunk/www/macros/macro_smftopics.php

@@ -25 +25 @@
     }
 
-    $args = array(
-        'url' => IA_SMF_URL.'/ia_recenttopics.php?board_id='.$board_id.'&count='.$count
-    );
-    return macro_remotebox($args, true);
+    $url = IA_SMF_URL.'/ia_recenttopics.php?board_id='.$board_id.'&count='.$count;
+
+    return macro_remotebox($url, true);
 }
 

trunk/www/static/js/remotebox.js

@@ -5 +5 @@
 
 var RemoteBox_Url = '';
-var RemoteBox_Display = 'hide';
-var RemoteBox_BeginComm = 1;
-var RemoteBox_MaxComm = 10;
 
-function RemoteBox_Load() {
+function RemoteBox_Load(remotebox_function) {
     var container = $('remotebox');
     if (!container || !RemoteBox_Url) {
@@ -19 +16 @@
     container.innerHTML = '<div class="loading"> <img src="/static/images/indicator.gif" />Se incarca ...</div>';
 
-    var d = doSimpleXMLHttpRequest(RemoteBox_Url + "&display=" + RemoteBox_Display +
-            "&begin_comm=" + RemoteBox_BeginComm +
-            "&max_comm=" + RemoteBox_MaxComm);
+    var d = doSimpleXMLHttpRequest(RemoteBox_Url);
 
     var ready = function(data) {
@@ -34 +29 @@
 
     d.addCallbacks(ready, error);
+    d.addCallbacks(remotebox_function, null);
+}
+
+function RemoteBox_Comments(begin_comm, max_comm, focus_on_comments, display) {
+    var RemoteBox_Base_Url = RemoteBox_Url;
+
+    RemoteBox_Url = RemoteBox_Url + "&display=" + display +
+            "&begin_comm=" + begin_comm +
+            "&max_comm=" + max_comm;
+    if (focus_on_comments == true) {
+        var remotebox_function = function() {
+            // set the anchor to the "comentarii" element
+            window.location.hash = "comentarii";
+        }
+        RemoteBox_Load(remotebox_function);
+    } else {
+        RemoteBox_Load(null);
+    }
+
+    RemoteBox_Url = RemoteBox_Base_Url;
 }
 

trunk/www/views/blog_view.php

@@ -35 +35 @@
 echo '</div>';
 // blog comments
-echo '<div id="comentarii">';
 if (getattr($view, 'forum_topic')) {
     echo macro_smfcomments(array('topic_id' => $view['forum_topic'], 'display' => 'show'));
 }
-echo '</div></div>';
+echo '</div>';
 echo '</div>';
 

trunk/www/views/textblock_view.php

@@ -20 +20 @@
 
 // page comments
-echo '<div id="comentarii">';
 if (getattr($view, 'forum_topic')) {
     require_once(IA_ROOT_DIR.'www/macros/macro_smfcomments.php');
     echo macro_smfcomments(array('topic_id' => $view['forum_topic'], 'display' => 'hide'));
 }
-echo '</div>';
 
 // site footer