Changeset 216

Timestamp:

07/02/10 08:41:23 (19 months ago)

Author:

fuze

Message:

Ticket #136 частично, без аватара. Мелкие поправки

Location:

branches/fuze

Files:

• components/faq/frontend.php (modified) (3 diffs)
• templates/_default_/components/com_faq_read.tpl (modified) (1 diff)
• templates/_default_/components/com_faq_view.tpl (modified) (1 diff)
• templates/_default_/css/styles.css (modified) (1 diff)

branches/fuze/components/faq/frontend.php

@@ -31 +31 @@
                         FROM cms_faq_cats
                         WHERE id = '$id'
-                        ORDER BY title ASC
+                        ORDER BY title ASC LIMIT 1
                         ";              
         
@@ -71 +71 @@
         
         //CURRENT CATEGORY CONTENT
-        $perpage = 10;
+        $perpage = 15;
         $page = $inCore->request('page', 'int', 1);     
         
         if ($id > 0){           
-                $sql = "SELECT *
-                                FROM cms_faq_quests
-                                WHERE category_id = $id AND published = 1
-                                ORDER BY cms_faq_quests.pubdate DESC
+                $sql = "SELECT q.*, u.login, u.nickname
+                                FROM cms_faq_quests q
+                                LEFT JOIN cms_users u ON u.id = q.user_id
+                                WHERE q.category_id = $id AND q.published = 1
+                                ORDER BY q.pubdate DESC
                                 LIMIT ".(($page-1)*$perpage).", $perpage";      
                 $result_total = $inDB->query("SELECT id FROM cms_faq_quests WHERE category_id = $id AND published = 1") ;
                 $records = $inDB->num_rows($result_total);      
         } else {
-                $sql = "SELECT q.*, c.title cat_title, c.id cid
-                                FROM cms_faq_quests q, cms_faq_cats c
-                                WHERE q.published = 1 AND q.category_id = c.id
+                $sql = "SELECT q.*, c.title cat_title, c.id cid, u.login, u.nickname
+                                FROM cms_faq_quests q
+                                LEFT JOIN cms_faq_cats c ON c.id = q.category_id
+                                LEFT JOIN cms_users u ON u.id = q.user_id
+                                WHERE q.published = 1
                                 ORDER BY q.pubdate DESC
                                 LIMIT 10";                      
@@ -118 +121 @@
                 $sql = "SELECT con.*,
                                                 DATE_FORMAT(con.pubdate, '%d-%m-%Y') shortdate,
-                                                cat.title cat_title, cat.id cat_id
-                                FROM cms_faq_quests con, cms_faq_cats cat
-                                WHERE con.id = $id AND con.category_id = cat.id
-                                ";
+                                                cat.title cat_title, cat.id cat_id, u.login, u.nickname
+                                FROM cms_faq_quests con
+                                LEFT JOIN cms_faq_cats cat ON cat.id = con.category_id
+                                LEFT JOIN cms_users u ON u.id = con.user_id
+                                WHERE con.id = $id LIMIT 1";
                                 
                 $result = $inDB->query($sql) ;

branches/fuze/templates/_default_/components/com_faq_read.tpl

@@ -10 +10 @@
                 <td width="" valign="top">
                         <div class="faq_questtext">{$quest.quest}</div>
+            <div class="faq_questuser"><a href="{profile_url login=$quest.login}">{$quest.nickname}</a> &rarr; </div>
                         <div class="faq_questdate">{$quest.pubdate}</div>
                 </td>   

branches/fuze/templates/_default_/components/com_faq_view.tpl

@@ -40 +40 @@
                                         <td width="" valign="middle">
                                                 <div><a href="/faq/quest{$quest.id}.html">{$quest.quest}</a></div>
+                        <div class="faq_questuser"><a href="{profile_url login=$quest.login}">{$quest.nickname}</a> &rarr; </div>
                                                 <div class="faq_questdate">{$quest.pubdate}</div>
                                                 <div class="faq_questcat"><a href="/faq/{$quest.cid}">{$quest.cat_title}</a></div>                                      

branches/fuze/templates/_default_/css/styles.css

@@ -970 +970 @@
         float:left;
 }
+.faq_questuser{
+        padding:2px 2px 2px 20px;
+        font-size:10px;
+        text-align:center;
+        margin-top:2px;
+        float:left;
+        background:url(/images/icons/users.gif) no-repeat;
+}
 .faq_questcat{
         padding:2px;