Skip to content

Commit 637316f

Browse files
jmontoyaajmontoyaa
committed
Improving forum title
1 parent 04e658e commit 637316f

File tree

6 files changed

+32
-26
lines changed

6 files changed

+32
-26
lines changed

‎main/css/base_chamilo.css‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -810,7 +810,6 @@ input.liteoption {
810810
border: 2px solid #f00;
811811
}
812812

813-
814813
#courseintro {
815814
clear: both;
816815
width: 80%;
@@ -1310,6 +1309,7 @@ tr.forum_threadheader td {
13101309
font-weight: bold;
13111310
background-color: #F7F7F7;
13121311
height: 20px;
1312+
font-size:20px;
13131313
}
13141314
.forum_message_post_title_2_be_approved {
13151315
/*border-bottom: 1px solid #666666;*/
@@ -2877,9 +2877,9 @@ span.form_required {
28772877
border-collapse: collapse;
28782878
width: 100%;
28792879
padding: 5px;
2880-
border-left: 1px solid gray;
2881-
border-top: 1px solid gray;
2882-
border-right: 1px solid gray;
2880+
border-left: 1px solid #ccc;
2881+
border-top: 1px solid #ccc;
2882+
border-right: 1px solid #ccc;
28832883
padding:5px;
28842884
}
28852885

@@ -2894,20 +2894,18 @@ span.form_required {
28942894
border-collapse: collapse;
28952895
width: 100%;
28962896
padding: 5px;
2897-
border: 1px solid gray;
2897+
border: 1px solid #ccc;
28982898
margin-bottom:15px;
28992899
}
29002900

29012901
.forum_table .forum_head{
29022902
padding:5px;
29032903
text-align: left;
29042904
font-size:14px;
2905-
29062905
}
29072906

29082907
.forum_table th {
29092908
padding-right: 12px;
2910-
/*border: 1px solid gray;*/
29112909
background-color: #E5EDF9;
29122910
}
29132911
.forum_table tr.row_odd {
@@ -2922,13 +2920,14 @@ span.form_required {
29222920
.forum_table td {
29232921
padding: 5px;
29242922
vertical-align: top;
2925-
border-bottom: 1px solid #b0b0b0;
2923+
border-bottom: 1px solid #ccc;
29262924
border-right: 1px dotted #e1e1e1;
29272925
border-left: 1px dotted #e1e1e1;
2926+
border-top: 1px solid #ccc;
29282927
}
29292928

29302929
.post {
2931-
border: 1px solid gray;
2930+
border: 1px solid #ccc;
29322931
margin-bottom:5px;
29332932
}
29342933

‎main/forum/forumfunction.inc.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3398,7 +3398,9 @@ function search_link() {
33983398
$return = '';
33993399

34003400
if ($origin != 'learnpath') {
3401-
$return = '<a href="forumsearch.php?'.api_get_cidreq().'&amp;gidReq='.Security::remove_XSS($_GET['gidReq']).'&amp;action=search&amp;origin='.$origin.'"> '.Display::return_icon('search.png', get_lang('Search'),'','32').'</a>';
3401+
$return = '<a href="forumsearch.php?'.api_get_cidreq().'&amp;gidReq='.Security::remove_XSS($_GET['gidReq']).'&amp;action=search&amp;origin='.$origin.'"> ';
3402+
$return .= Display::return_icon('search.png', get_lang('Search'),'','32').'</a>';
3403+
34023404
if (!empty($_GET['search'])) {
34033405
$return .= ': '.Security::remove_XSS($_GET['search']).' ';
34043406
$url = api_get_self().'?';

‎main/forum/forumsearch.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@
7575
$interbreadcrumb[] = array('url' => 'forumsearch.php','name' => get_lang('ForumSearch'));
7676
} else {
7777
$interbreadcrumb[] = array('url' => 'index.php?gradebook='.$gradebook.'', 'name' => $nameTools);
78-
$interbreadcrumb[] = array('url' => 'forumsearch.php', 'name' => get_lang('ForumSearch'));
78+
//$interbreadcrumb[] = array('url' => 'forumsearch.php', 'name' => );
79+
$nameTools = get_lang('ForumSearch');
7980
}
8081

8182
// Display the header.

‎main/forum/index.php‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,19 +80,23 @@ function advanced_parameters() {
8080
}
8181

8282
$search_forum = isset($_GET['search']) ? Security::remove_XSS($_GET['search']) : '';
83-
$interbreadcrumb[] = array('url' => 'index.php?gradebook='.$gradebook.'&amp;search='.$search_forum, 'name' => $nameTools);
83+
8484

8585
if (isset($_GET['action']) && $_GET['action'] == 'add') {
8686
switch ($_GET['content']) {
8787
case 'forum':
88+
$interbreadcrumb[] = array('url' => 'index.php?gradebook='.$gradebook.'&amp;search='.$search_forum, 'name' => $nameTools);
8889
$interbreadcrumb[] = array('url' => api_get_self().'?'.api_get_cidreq().'&amp;gradebook='.$gradebook.'&amp;action=add&amp;content=forum', 'name' => get_lang('AddForum'));
8990
break;
9091
case 'forumcategory':
92+
$interbreadcrumb[] = array('url' => 'index.php?gradebook='.$gradebook.'&amp;search='.$search_forum, 'name' => $nameTools);
9193
$interbreadcrumb[] = array('url' => api_get_self().'?'.api_get_cidreq().'&amp;gradebook='.$gradebook.'&amp;action=add&amp;content=forumcategory', 'name' => get_lang('AddForumCategory'));
9294
break;
93-
default:
95+
default:
9496
break;
9597
}
98+
} else {
99+
$interbreadcrumb[] = array('url' => '#', 'name' => $nameTools);
96100
}
97101

98102
Display::display_header('');
@@ -182,13 +186,15 @@ function advanced_parameters() {
182186
if (!empty($_GET['lp_id']) || !empty($_POST['lp_id'])){
183187
echo "<a href=\"../newscorm/lp_controller.php?".api_get_cidreq()."&gradebook=&action=add_item&type=step&lp_id=".$lp_id."#resource_tab-5\">".Display::return_icon('back.png', get_lang("BackTo").' '.get_lang("LearningPaths"),'','32')."</a>";
184188
}
185-
echo '<span>'.search_link().'</span>';
189+
if (!empty($forum_list)) {
190+
echo search_link();
191+
}
192+
186193
if (api_is_allowed_to_edit(false, true)) {
187194
echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;gradebook='.$gradebook.'&amp;action=add&amp;content=forumcategory&amp;lp_id='.$lp_id.'"> '.Display::return_icon('new_folder.png', get_lang('AddForumCategory'),'','32').'</a>';
188195
if (is_array($forum_categories_list) and !empty($forum_categories_list)) {
189196
echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;gradebook='.$gradebook.'&amp;action=add&amp;content=forum&amp;lp_id='.$lp_id.'"> '.Display::return_icon('new_forum.png', get_lang('AddForum'),'','32').'</a>';
190197
}
191-
//echo ' | <a href="forum_migration.php">'.get_lang('MigrateForum').'</a>';
192198
}
193199
echo '</div>';
194200

‎main/forum/reply.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ function advanced_parameters() {
115115
} else {
116116
// The last element of the breadcrumb navigation is already set in interbreadcrumb, so give an empty string.
117117
Display :: display_header('');
118-
api_display_tool_title($nameTools);
119118
}
120119

121120
/* Is the user allowed here? */

‎main/forum/viewthread_flat.inc.php‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,9 @@
3030
$messageclass='forum_message_post_text';
3131
$leftclass='forum_message_left';
3232
}
33-
34-
echo '<thead>';
35-
echo '<tr>';
36-
echo '<th class="forum_head" colspan="2">'.prepare4display($row['post_title'])."</th>";
37-
echo '</tr>';
38-
echo '</thead>';
39-
4033
echo "<tr>";
41-
//echo "<td rowspan=\"3\" class=\"$leftclass\">";
42-
echo "<td rowspan=\"2\" class=\"$leftclass\">";
34+
echo "<td rowspan=\"3\" class=\"$leftclass\">";
35+
4336
if ($row['user_id']=='0') {
4437
$name=prepare4display($row['poster_name']);
4538
} else {
@@ -123,9 +116,15 @@
123116
// The post title
124117

125118
echo "</tr>";
126-
119+
120+
// The post title
121+
echo "<tr>";
122+
echo Display::tag('td', prepare4display($row['post_title']), array('class'=>'forum_message_post_title'));
123+
echo "</tr>";
124+
127125
// The post message
128126
echo "<tr>";
127+
129128
// see comments inside forumfunction.inc.php to lower filtering and allow more visual changes
130129
echo "<td class=\"$messageclass\">".prepare4display($row['post_text'])."</td>";
131130
echo "</tr>";

0 commit comments

Comments
 (0)