Skip to content
Snippets Groups Projects
Commit 5df5ee56 authored by Peter Rotich's avatar Peter Rotich
Browse files

Merge pull request #63 from kellishaver/feature/client-side-kb-layout 

Feature/client side kb layout

Reviewed By: Peter Rotich 04/23/12
parents 1e77eaa6 d6c21df1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
assets/default/css/theme.css
+ 75
− 11
View file @ 5df5ee56
...@@ -379,19 +379,33 @@ body { ...@@ -379,19 +379,33 @@ body {
font-size: 15px; font-size: 15px;
margin-left: 0; margin-left: 0;
padding-left: 0; padding-left: 0;
border-top:1px solid #ddd;
} }
#faq ol li { #faq ol li {
list-style: none; list-style: none;
margin: 0 0 10px 0; margin: 0;
padding:0;
color: #999; color: #999;
} }
#faq ol li a { #faq ol li a {
display: block; display:block;
height: 16px; padding:5px 0;
height:auto !important;
overflow:hidden;
margin:0;
border-bottom:1px solid #ddd;
line-height: 16px; line-height: 16px;
padding-left: 24px; padding-left: 24px;
background: url('../images/icons/page.png?1319579499') 0 50% no-repeat; background: url('../images/icons/page.png?1319579499') 0 50% no-repeat;
} }
#faq ol li a:hover {
background-color:#e9f5ff;
}
.article-meta {
padding:5px;
background:#fafafa;
}
/* Knowledgebase */ /* Knowledgebase */
#kb { #kb {
...@@ -401,12 +415,21 @@ body { ...@@ -401,12 +415,21 @@ body {
} }
#kb > li { #kb > li {
margin: 0 0 5px 0; padding:10px;
padding: 10px; height:auto !important;
width: auto; overflow:hidden;
float: left; margin:0;
clear: both; background:url(../images/kb_category_bg.png) bottom left repeat-x;
list-style: none; border-bottom:1px solid #ddd;
}
#kb li i {
display:block;
width:32px;
height:32px;
float:left;
margin-right:6px;
background:url(../images/kb_large_folder.png) top left no-repeat;
} }
#kb > li h4 { #kb > li h4 {
...@@ -420,10 +443,51 @@ body { ...@@ -420,10 +443,51 @@ body {
#kb > li h4 a { #kb > li h4 a {
font-size: 14px; font-size: 14px;
padding-left: 24px;
background: url('../images/icons/page.png?1319579499') 0 50% no-repeat;
} }
#kb-search {
padding:10px 0;
overflow:hidden;
}
#kb-search div {
clear:both;
overflow:hidden;
padding-top:5px;
}
#kb-search #query {
margin:0;
display:inline-block;
float:left;
width:200px;
margin-right:5px;
}
#kb-search #cid {
margin:0;
display:inline-block;
float:left;
width:200px;
margin-right:5px;
position:relative;
top:2px;
}
#kb-search #topic-id {
margin:0;
display:inline-block;
float:left;
width:410px;
}
#kb-search #searchSubmit {
margin:0;
display:inline-block;
float:left;
position:relative;
top:2px;
}
#breadcrumbs { #breadcrumbs {
color: #333; color: #333;
......
assets/default/images/kb_category_bg.png 0 → 100644
+ 0
− 0
View file @ 5df5ee56
assets/default/images/kb_category_bg.png

937 B

assets/default/images/kb_large_folder.png 0 → 100644
+ 0
− 0
View file @ 5df5ee56
assets/default/images/kb_large_folder.png

2.47 KiB

include/client/faq.inc.php
+ 3
− 2
View file @ 5df5ee56
...@@ -6,7 +6,7 @@ $category=$faq->getCategory(); ...@@ -6,7 +6,7 @@ $category=$faq->getCategory();
?> ?>
<h1>Frequently Asked Questions</h1> <h1>Frequently Asked Questions</h1>
<div id="breadcrumbs"> <div id="breadcrumbs">
<a href="index.php">All Categories</a> <a href="index.php">All Categories</a>
&raquo; <a href="faq.php?cid=<? echo $category->getId(); ?>"><? echo $category->getName(); ?></a> &raquo; <a href="faq.php?cid=<? echo $category->getId(); ?>"><? echo $category->getName(); ?></a>
</div> </div>
<div style="width:700;padding-top:2px; float:left;"> <div style="width:700;padding-top:2px; float:left;">
...@@ -23,7 +23,8 @@ if($faq->getNumAttachments()) { ?> ...@@ -23,7 +23,8 @@ if($faq->getNumAttachments()) { ?>
<div><span class="faded"><b>Attachments:</b></span> <?php echo $faq->getAttachmentsLinks(); ?></div> <div><span class="faded"><b>Attachments:</b></span> <?php echo $faq->getAttachmentsLinks(); ?></div>
<? <?
}?> }?>
<div><span class="faded"><b>Help Topics:</b></span>
<div class="article-meta"><span class="faded"><b>Help Topics:</b></span>
<?php echo ($topics=$faq->getHelpTopics())?implode(', ',$topics):' '; ?> <?php echo ($topics=$faq->getHelpTopics())?implode(', ',$topics):' '; ?>
</div> </div>
</p> </p>
......
include/client/knowledgebase.inc.php
+ 48
− 55
View file @ 5df5ee56
...@@ -3,61 +3,53 @@ if(!defined('OSTCLIENTINC')) die('Access Denied'); ...@@ -3,61 +3,53 @@ if(!defined('OSTCLIENTINC')) die('Access Denied');
?> ?>
<h1>Frequently Asked Questions</h1> <h1>Frequently Asked Questions</h1>
<form action="index.php" method="get" style="padding-top:15px;"> <form action="index.php" method="get" id="kb-search">
<input type="hidden" name="a" value="search"> <input type="hidden" name="a" value="search">
<table border="0" cellspacing="0" cellpadding="3"> <div>
<tr> <input id="query" type="text" size="20" name="q" value="<?php echo Format::htmlchars($_REQUEST['q']); ?>">
<td width="440"> <select name="cid" id="cid">
<input id="query" type="text" size="20" name="q" value="<?php echo Format::htmlchars($_REQUEST['q']); ?>"> <option value="">&mdash; All Categories &mdash;</option>
<select name="cid"> <?php
<option value="">&mdash; All Categories &mdash;</option> $sql='SELECT category_id, name, count(faq.category_id) as faqs '
<?php .' FROM '.FAQ_CATEGORY_TABLE.' cat '
$sql='SELECT category_id, name, count(faq.category_id) as faqs ' .' LEFT JOIN '.FAQ_TABLE.' faq USING(category_id) '
.' FROM '.FAQ_CATEGORY_TABLE.' cat ' .' WHERE cat.ispublic=1 AND faq.ispublished=1 '
.' LEFT JOIN '.FAQ_TABLE.' faq USING(category_id) ' .' GROUP BY cat.category_id '
.' WHERE cat.ispublic=1 AND faq.ispublished=1 ' .' HAVING faqs>0 '
.' GROUP BY cat.category_id ' .' ORDER BY cat.name DESC ';
.' HAVING faqs>0 ' if(($res=db_query($sql)) && db_num_rows($res)) {
.' ORDER BY cat.name DESC '; while($row=db_fetch_array($res))
if(($res=db_query($sql)) && db_num_rows($res)) { echo sprintf('<option value="%d" %s>%s (%d)</option>',
while($row=db_fetch_array($res)) $row['category_id'],
echo sprintf('<option value="%d" %s>%s (%d)</option>', ($_REQUEST['cid'] && $row['category_id']==$_REQUEST['cid']?'selected="selected"':''),
$row['category_id'], $row['name'],
($_REQUEST['cid'] && $row['category_id']==$_REQUEST['cid']?'selected="selected"':''), $row['faqs']);
$row['name'], }
$row['faqs']); ?>
} </select>
?> <input id="searchSubmit" type="submit" value="Search">
</select> </div>
</td> <div>
<td width="100" rowspan="2" style="text-align:left;vertical-align: middle;"> <select name="topicId" id="topic-id">
<input id="searchSubmit" type="submit" value="Search"> <option value="">&mdash; All Help Topics &mdash;</option>
</td> <?php
</tr> $sql='SELECT ht.topic_id, ht.topic, count(faq.topic_id) as faqs '
<tr> .' FROM '.TOPIC_TABLE.' ht '
<td width="400"> .' LEFT JOIN '.FAQ_TOPIC_TABLE.' faq USING(topic_id) '
<select name="topicId" style="width:350px;"> .' WHERE ht.ispublic=1 '
<option value="">&mdash; All Help Topics &mdash;</option> .' GROUP BY ht.topic_id '
<?php .' HAVING faqs>0 '
$sql='SELECT ht.topic_id, ht.topic, count(faq.topic_id) as faqs ' .' ORDER BY ht.topic DESC ';
.' FROM '.TOPIC_TABLE.' ht ' if(($res=db_query($sql)) && db_num_rows($res)) {
.' LEFT JOIN '.FAQ_TOPIC_TABLE.' faq USING(topic_id) ' while($row=db_fetch_array($res))
.' WHERE ht.ispublic=1 ' echo sprintf('<option value="%d" %s>%s (%d)</option>',
.' GROUP BY ht.topic_id ' $row['topic_id'],
.' HAVING faqs>0 ' ($_REQUEST['topicId'] && $row['topic_id']==$_REQUEST['topicId']?'selected="selected"':''),
.' ORDER BY ht.topic DESC '; $row['topic'], $row['faqs']);
if(($res=db_query($sql)) && db_num_rows($res)) { }
while($row=db_fetch_array($res)) ?>
echo sprintf('<option value="%d" %s>%s (%d)</option>', </select>
$row['topic_id'], </div>
($_REQUEST['topicId'] && $row['topic_id']==$_REQUEST['topicId']?'selected="selected"':''),
$row['topic'], $row['faqs']);
}
?>
</select>
</td>
</tr>
</table>
</form> </form>
<hr> <hr>
<div> <div>
...@@ -100,9 +92,10 @@ if($_REQUEST['q'] || $_REQUEST['cid'] || $_REQUEST['topicId']) { //Search. ...@@ -100,9 +92,10 @@ if($_REQUEST['q'] || $_REQUEST['cid'] || $_REQUEST['topicId']) { //Search.
echo '<div>Click on the category to browse FAQs.</div> echo '<div>Click on the category to browse FAQs.</div>
<ul id="kb">'; <ul id="kb">';
while($row=db_fetch_array($res)) { while($row=db_fetch_array($res)) {
echo sprintf(' echo sprintf('
<li> <li>
<i></i>
<h4><a href="faq.php?cid=%d">%s (%d)</a></h4> <h4><a href="faq.php?cid=%d">%s (%d)</a></h4>
%s %s
</li>',$row['category_id'], </li>',$row['category_id'],
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment