From c723b43c68a9d37da812d36781dbe24e8a5f043b Mon Sep 17 00:00:00 2001 From: Cameron Date: Thu, 20 Jun 2013 17:12:58 -0700 Subject: [PATCH] Forum styling --- e107_plugins/forum/forum.php | 3 ++- e107_plugins/forum/forum_class.php | 14 ++++++----- e107_plugins/forum/forum_viewforum.php | 22 ++++++++++++++---- e107_plugins/forum/images/icons/announce.png | Bin 1184 -> 2179 bytes .../templates/forum_viewforum_template.php | 4 ++-- .../templates/forum_viewtopic_template.php | 2 +- 6 files changed, 31 insertions(+), 14 deletions(-) diff --git a/e107_plugins/forum/forum.php b/e107_plugins/forum/forum.php index ef7eac91e..189fc0d45 100644 --- a/e107_plugins/forum/forum.php +++ b/e107_plugins/forum/forum.php @@ -250,12 +250,13 @@ if (!$forumList) $forum_string = ''; $pVars = new e_vars; +$frm = e107::getForm(); foreach ($forumList['parents'] as $parent) { $status = parse_parent($parent); $pVars->PARENTSTATUS = $status; - $pVars->PARENTNAME = $parent['forum_name']; + $pVars->PARENTNAME = "".$parent['forum_name'].""; $forum_string .= $tp->simpleParse($FORUM_MAIN_PARENT, $pVars); if (!count($forumList['forums'][$parent['forum_id']])) { diff --git a/e107_plugins/forum/forum_class.php b/e107_plugins/forum/forum_class.php index b114df87f..f3465afaa 100644 --- a/e107_plugins/forum/forum_class.php +++ b/e107_plugins/forum/forum_class.php @@ -1564,6 +1564,8 @@ class e107forum { $e107 = e107::getInstance(); $tp = e107::getParser(); + $frm = e107::getForm(); + global $FORUM_CRUMB, $forumInfo, $threadInfo, $thread; global $BREADCRUMB,$BACKLINK; // Eventually we should deprecate BACKLINK @@ -1579,8 +1581,8 @@ class e107forum $replace = array(LAN_FORUM_0001, e107::getUrl()->create('forum/forum/main')); $FORUM_CRUMB['forums']['value'] = str_replace($search, $replace, $FORUM_CRUMB['forums']['value']); - $search = '{PARENT_TITLE}'; - $replace = $tp->toHTML($forumInfo['parent_name']); + $search = array('{PARENT_TITLE}', '{PARENT_HREF}'); + $replace = array($tp->toHTML($forumInfo['parent_name']), e107::getUrl()->create('forum/forum/main')."#".$frm->name2id($forumInfo['parent_name'])); $FORUM_CRUMB['parent']['value'] = str_replace($search, $replace, $FORUM_CRUMB['parent']['value']); if($forumInfo['forum_sub']) @@ -1794,22 +1796,22 @@ function img_path($filename) { if($ML) { - $image = (is_readable(e_PLUGIN.'forum/images/'.IMODE.'/'.e_LANGUAGE.'_'.$filename)) ? e_PLUGIN.'forum/images/'.IMODE.'/'.e_LANGUAGE.'_'.$filename : e_PLUGIN.'forum/images/'.IMODE.'/English_'.$filename; + $image = (is_readable(e_PLUGIN.'forum/images/icons/'.e_LANGUAGE.'_'.$filename)) ? e_PLUGIN.'forum/images/icons/'.e_LANGUAGE.'_'.$filename : e_PLUGIN.'forum/images/icons/English_'.$filename; } else { - $image = e_PLUGIN.'forum/images/'.IMODE.'/'.$filename; + $image = e_PLUGIN.'forum/images/icons/'.$filename; } } else { if($ML) { - $image = (is_readable(e_PLUGIN."forum/images/lite/".e_LANGUAGE.'_'.$filename)) ? e_PLUGIN.'forum/images/lite/'.e_LANGUAGE.'_'.$filename : e_PLUGIN.'forum/images/lite/English_'.$filename; + $image = (is_readable(e_PLUGIN."forum/images/lite/".e_LANGUAGE.'_'.$filename)) ? e_PLUGIN.'forum/images/icons/'.e_LANGUAGE.'_'.$filename : e_PLUGIN.'forum/images/icons/English_'.$filename; } else { - $image = e_PLUGIN.'forum/images/lite/'.$filename; + $image = e_PLUGIN.'forum/images/icons/'.$filename; } } diff --git a/e107_plugins/forum/forum_viewforum.php b/e107_plugins/forum/forum_viewforum.php index ee33437b5..c85b488e6 100644 --- a/e107_plugins/forum/forum_viewforum.php +++ b/e107_plugins/forum/forum_viewforum.php @@ -726,7 +726,7 @@ function fpages($thread_info, $replies) $text .= $text ? ' ' : ''; $urlparms['page'] = $aa; $url = e107::getUrl()->create('forum/thread/view', $urlparms); - $opts[] = "{$aa}"; //FIXME LAN_GOPAGE syntax? + $opts[] = "{$aa}"; //FIXME LAN_GOPAGE syntax? } $text .= ' ... '; for($a = $pages-3; $a <= $pages-1; $a++) @@ -735,7 +735,7 @@ function fpages($thread_info, $replies) $text .= $text ? ' ' : ''; $urlparms['page'] = $aa; $url = e107::getUrl()->create('forum/thread/view', $urlparms); - $opts[] = "{$aa}"; //FIXME LAN_GOPAGE syntax? + $opts[] = "{$aa}"; //FIXME LAN_GOPAGE syntax? } } else @@ -746,12 +746,26 @@ function fpages($thread_info, $replies) $text .= $text ? ' ' : ''; $urlparms['page'] = $aa; $url = e107::getUrl()->create('forum/thread/view', $urlparms); - $opts[] = "{$aa}"; //FIXME LAN_GOPAGE syntax? + $opts[] = "{$aa}"; //FIXME LAN_GOPAGE syntax? } } + if(deftrue('BOOTSTRAP')) + { + $text = ""; + $text .= ""; + } + else + { + $text = implode("",$opts); // .""; + } + + - $text = implode("",$opts); // .""; } else diff --git a/e107_plugins/forum/images/icons/announce.png b/e107_plugins/forum/images/icons/announce.png index 2978abbabe7d32569e025152384b101e17ebc57f..c79178c44b6bbeab2b5110c12fed57764480acbb 100644 GIT binary patch literal 2179 zcmbVOc~Db#9*;H43WfxX*?MKqX{H&0D>*zB>=$yPmrF{ z54gi%n*~B{1Q@~bBl9I96i=msK!Q+AK`vbDKq7j z5(T;LR0Jmw;VF>;2m%V@#K*W`5H460))`ME5*-mZ3>JgN;Luo{6P8GJ#*r}?#D@n7 zS(6Fk$-xZP2V2mJf=mQKDH)AUOG`tgIin=91T>aJBB?cSI420o)nEmVbCIxI-<=k{BfDQ)al2jQVsz2!<>i-F(J_!O6p!P1x*7KTB?V6j*xj?Tid zXiQfE%^8O$;2De!E?X=Id15}WVOI#*UFR}cf666$$^afHk#QxGUFN*|H&8{at5t#jsI$u zjV-AE)YFfR4=p}k9Y74-7a4RhhNxXt9}6E<6%EvnyoxLQFHoa z%}V{m=|}wrzh_vDOzhv&#_j)sJ|evAtlKmm&>P^tzoNbhPg(oA@%s+Y(7q||MqIb< zvp9>3*RL)`TV}iy`IXyuEE^83Cr=LA#{7Er%OzFc?|%(46m{gBbQmx-GgDeDxa+6- z;dEmZVo#MzbFtOnrNf<%ZVu0q64N=~`e-nNJI%Z*@&dhiE$8rb^mFB$o0PugwshOo z9Ieqpt?>hkmA`aO1bqFrG-uUu6=Hlj!{}HXpBR7 z)_QyYvWOgFn&!6={KxV*Qz45XZ|aGL9_4hKrK$U`t&+m(n2iHm(-QL>-8}02$ctg+ zXdjB(yj$lVpV{g+^mSG~7 zkp?-pLAs*US-H++mup4;$Y%uW(e4p%9+}Oz75wbg<@uuGOtMwQcQmr&?uLu5+$J5p zRM?P9aOfr_sTE&$3-9l}H#;-adJ{zh;F!p=O7}DDBErR4zikl`?=+m>bZnq)TtnGZ z&$3N)E;Q_9YaK=U)H3Yi&Y=9a!cD7G<2zU85s{k*TFBEeypigOJYyU&Us(Cf?WfQp zJ;q%l;|Sa4hpfuG1xSR%YfPK`N~<)sx#fO3a_7NT@bbxLi#R>se%td6zZU6pa@aw) zx-hDxW#KG*cka{|U|IKhYSBJ0@bBx^FA>^Kd8+ zG}q8{dX`}@c&3t~^Uz-S`R=(e$9IUogH^sQjn;1uhXv-R`prG9kgqm8(MyHxI#yEF--@pHyeYqbSG9`VgWjg3BTyY*m*7or@aCVc6ZVBqDQ zaJ36=!ab5#Yht$zjynb?l=yfN3A)KV-9hX4R)y+>q)3t7Q`?bZZS#m;L(83m@0!=k zJ$2Z{c&4drh*Dg25gt^vo$C8CHu=DgQ8Y8+%{}G6DuM0d1f^4f)pBfG672T$YPR!Y z_o)u5_K00cLx9NHq)$ delta 1175 zcmV;I1Zew%5ugc>8Gi!+008r9oCyE`00d`2O+f$vv5yPD>H$gIFP+g{8 zch6&f-e7prV_>UaH)>E5H$P>5f%*FSIagmJPe)v_S90Y|dw=szhWS;H|6P3ZP;=-| zUbj{!RY@#ORqyihJ6v8XTuWTbOI_hOX5T_|=1qd}Sdsc+hVofw;6q)}NHS+mD@#-R z{QQ2NjT}@uPr*Y+&?{BaIb_>Iee6?z?p0>pL`cpoP{%+cR7l|K;u2IRJ)%B2$Rb0< zEK$!lUf4fr;D1M>s;Zo$qf*c}MaC{br9u%nK+f0Ke5!vTcqufxC@;GnKEf(W$}uJ= zC>tCcU)exR%Q8R2D=@qtGrc4xV@G0pfG~eBE14)Fu@@?}8#cWpLBuOr)jV9+K2y;+ zOw2PYwH+b15-*NDA8{Zor79Mw4kND?Ew&v-$uLgNG=C(p7Z$AyCY~x8L`D^B9vhz= z3#0}bsu3`|A2q%pIl&`p7?&CXodFJ{3L2~rDYG3v zx;0Y2OH)%*Lc2Evp8*w>8x%%C9$_sYjw1k;00Nr<37`cwu`*`EW`N6pi_eWuPfs;9 zHG#~5YJbFOIr;!w6A_#Z|Ba zY=(;I@9Pp-ClPTGQms*$*_yuPzR~T`+wt3}t$(ecrl!K@!d|#r6l)s|IXsK5l?YuB zXSiUi;;hc>&fxOk?Dy>P`thygt8~9`4MZ?;ij7T&RT^^`kk5+M^wr<=-|F`2_51bU z_21X`)0@(nBUnE&bNi4bBCDQzxwp?$H( zw|~dh&dAozwa2`Co{KPAOAR$Ne36po@8^c6jWb_F7D6@{J~)x3F!_PcK|tOOb0lXr&|LU z1CTq9Hy?258kjZX5Xj3|AK=2%2T*$sqoR(slK@m`h$!mP%q{8<@??NX8;C7d$gXV%)2-s+PE!#eLTV7@Whx=!>DKPt|3#1N2*O!oi)002ovPDHLkV1m9x{4xLl diff --git a/e107_plugins/forum/templates/forum_viewforum_template.php b/e107_plugins/forum/templates/forum_viewforum_template.php index d06ceed6f..e27148b9f 100644 --- a/e107_plugins/forum/templates/forum_viewforum_template.php +++ b/e107_plugins/forum/templates/forum_viewforum_template.php @@ -266,7 +266,7 @@ $FORUM_CRUMB['sitename']['sep'] = " :: "; $FORUM_CRUMB['forums']['value'] = "{FORUMS_TITLE}"; $FORUM_CRUMB['forums']['sep'] = " :: "; -$FORUM_CRUMB['parent']['value'] = "{PARENT_TITLE}"; +$FORUM_CRUMB['parent']['value'] = "{PARENT_TITLE}"; $FORUM_CRUMB['parent']['sep'] = " :: "; $FORUM_CRUMB['subparent']['value'] = "{SUBPARENT_TITLE}"; @@ -297,7 +297,7 @@ $FORUM_VIEWFORUM_TEMPLATE['header'] = "
{BACKLINK} {SUBFORUMS}"; -$FORUM_VIEWFORUM_TEMPLATE['item'] = "{ICON}{THREADNAME}
by {POSTER} {THREADTIMELAPSE} {PAGESX}
{REPLIESX}{VIEWSX}{LASTPOSTUSER} {LASTPOSTDATE}
{ADMINOPTIONS}
\n"; +$FORUM_VIEWFORUM_TEMPLATE['item'] = "{ICON}
{THREADNAME}
by {POSTER} {THREADTIMELAPSE}  
{PAGESX}
{REPLIESX}{VIEWSX}{LASTPOSTUSER} {LASTPOSTDATE}
{ADMINOPTIONS}
\n"; $FORUM_VIEWFORUM_TEMPLATE['item-sticky'] = $FORUMVIEW['item'] ; // "{THREADNAME}\n"; $FORUM_VIEWFORUM_TEMPLATE['item-announce'] = $FORUMVIEW['item'] ; // "{THREADNAME}\n"; diff --git a/e107_plugins/forum/templates/forum_viewtopic_template.php b/e107_plugins/forum/templates/forum_viewtopic_template.php index b90a72738..becaf01ae 100644 --- a/e107_plugins/forum/templates/forum_viewtopic_template.php +++ b/e107_plugins/forum/templates/forum_viewtopic_template.php @@ -297,7 +297,7 @@ $FORUM_CRUMB['sitename']['sep'] = " :: "; $FORUM_CRUMB['forums']['value'] = "{FORUMS_TITLE}"; $FORUM_CRUMB['forums']['sep'] = " :: "; -$FORUM_CRUMB['parent']['value'] = "{PARENT_TITLE}"; +$FORUM_CRUMB['parent']['value'] = "{PARENT_TITLE}"; $FORUM_CRUMB['parent']['sep'] = " :: "; $FORUM_CRUMB['subparent']['value'] = "{SUBPARENT_TITLE}";