Commit e0d6f1c6 authored by Pat Kira's avatar Pat Kira Committed by Aaron Wells
Browse files

Merge conflict (bootstrap)

Bug 1465107: Use Bootstrap CSS Framework

Change-Id: Icef39d16f07138c8cd38761239720117155286ed
parent f163fa6c
...@@ -5343,10 +5343,8 @@ define("tinymce/dom/DOMUtils", [ ...@@ -5343,10 +5343,8 @@ define("tinymce/dom/DOMUtils", [
* // Sets class attribute on a specific element in the current page * // Sets class attribute on a specific element in the current page
* tinymce.dom.setAttrib('mydiv', 'class', 'myclass'); * tinymce.dom.setAttrib('mydiv', 'class', 'myclass');
*/ */
<<<<<<< HEAD
setAttrib: function(elm, name, value) { setAttrib: function(elm, name, value) {
var self = this, originalValue, hook, settings = self.settings; var self = this, originalValue, hook, settings = self.settings;
=======
documentMode: ie ? (document.documentMode || 7) : 10 documentMode: ie ? (document.documentMode || 7) : 10
}; };
}); });
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
{/if} {/if}
{if $topic->canedit} {if $topic->canedit}
<a href="{$WWWROOT}interaction/forum/edittopic.php?id={$topic->id}" class="btn btn-default editforum"> <a href="{$WWWROOT}interaction/forum/edittopic.php?id={$topic->id}" class="btn btn-default editforum">
<span class="fa fa-pencil fa-lg prs"></span> <span class="fa fa-pencil prs"></span>
{str tag=edittopic section=interaction.forum} {str tag=edittopic section=interaction.forum}
</a> </a>
{if $moderator} {if $moderator}
...@@ -30,12 +30,7 @@ ...@@ -30,12 +30,7 @@
{$topic->subject} {$topic->subject}
</h2> </h2>
<hr class="mbxl" /> <hr class="mbxl" />
<h2>
{str tag=nameplural section=interaction.forum} &gt;
<a href="{$WWWROOT}interaction/forum/view.php?id={$topic->forumid}">
{$topic->forumtitle}
</a>
</h2>
{if $topic->closed} {if $topic->closed}
<div class="message closed"> <div class="message closed">
{str tag=topicisclosed section=interaction.forum} {str tag=topicisclosed section=interaction.forum}
......
...@@ -38,14 +38,9 @@ ...@@ -38,14 +38,9 @@
</span> </span>
</h3> </h3>
<div class="text-small threaddetails mtm"> <div class="text-small threaddetails mtm">
{if $publicgroup}
<a href="{$topic->feedlink}">
<span class="fa fa-rss"></span> <p>{$topic->body|str_shorten_html:50:true:false|safe}</p>
</a>
{/if}
</h3>
<div class="detail text-small mts">
{$topic->body|str_shorten_html:80:true:false|safe}
</div> </div>
</td> </td>
<td class="postscount text-center"> <td class="postscount text-center">
...@@ -71,21 +66,20 @@ ...@@ -71,21 +66,20 @@
</td> </td>
<td class="control-buttons"> <td class="control-buttons">
{if $moderator} {if $moderator}
<div class="btn-group">
<a href="{$WWWROOT}interaction/forum/edittopic.php?id={$topic->id}&amp;returnto=view" class="btn btn-default btn-xs" title="{str tag="edit"}"> <a href="{$WWWROOT}interaction/forum/edittopic.php?id={$topic->id}&amp;returnto=view" class="btn btn-default btn-xs" title="{str tag="edit"}">
<span class="fa fa-pencil"></span> <span class="fa fa-pencil"></span>
<span class="sr-only"> <span class="sr-only">
{str tag=edittopicspecific section=interaction.forum arg1=$topic->subject} {str tag=edittopicspecific section=interaction.forum arg1=$topic->subject}
</span> </span>
</a> </a>
<a href="{$WWWROOT}interaction/forum/deletetopic.php?id={$topic->id}&amp;returnto=view" class="btn btn-default btn-xs" title="{str tag="delete"}"> <a href="{$WWWROOT}interaction/forum/deletetopic.php?id={$topic->id}&amp;returnto=view" class="btn btn-danger btn-xs" title="{str tag="delete"}">
<span class="fa fa-trash text-danger"></span> <span class="fa fa-trash"></span>
<span class="sr-only"> <span class="sr-only">
{str tag=deletetopicspecific section=interaction.forum arg1=$topic->subject} {str tag=deletetopicspecific section=interaction.forum arg1=$topic->subject}
</span> </span>
</a> </a>
</div>
</td> </td>
{/if} {/if}
</tr> </tr>
{/foreach} {/foreach}
\ No newline at end of file
...@@ -47,8 +47,6 @@ ...@@ -47,8 +47,6 @@
</div> </div>
<div id="viewforum"> <div id="viewforum">
<<<<<<< HEAD
{if $stickytopics || $regulartopics} {if $stickytopics || $regulartopics}
<form action="" method="post" class="mtxl"> <form action="" method="post" class="mtxl">
<table id="forumtopicstable" class="table fullwidth table-striped table-padded"> <table id="forumtopicstable" class="table fullwidth table-striped table-padded">
...@@ -61,47 +59,7 @@ ...@@ -61,47 +59,7 @@
{if $moderator}<th class="right btns2"></th>{/if} {if $moderator}<th class="right btns2"></th>{/if}
</tr> </tr>
</thead> </thead>
=======
<h3 class="pull-left">
{str tag=Topics section="interaction.forum"}
</h3>
{if $membership && ($moderator || ($forum->newtopicusers != 'moderators') && $ineditwindow) }
<div class="btn-top-right ptl pbxl text-right">
<div class="btn-group">
<a href="{$WWWROOT}interaction/forum/edittopic.php?forum={$forum->id}" class="btn btn-default newforumtopic">
<span class="fa fa-plus fa-lg prs text-primary"></span>
{str tag="newtopic" section="interaction.forum"}
</a>
{if $admin}
<a href="{$WWWROOT}interaction/edit.php?id={$forum->id}" class="btn btn-default editforumtitle">
<span class="fa fa-cog"></span>
{str tag="edittitle" section="interaction.forum"}
</a>
<a href="{$WWWROOT}interaction/delete.php?id={$forum->id}" class="btn btn-default deleteforum">
<span class="fa fa-trash text-danger"></span>
{str tag="deleteforum" section="interaction.forum"}
</a>
{/if}
</div>
</div>
{/if}
{if $stickytopics || $regulartopics}
<form action="" method="post" class="ptxl">
<table id="forumtopicstable" class="table fullwidth">
<tr>
<th class="narrow"></th>
<th class="narrow"></th>
<th class="topic">{str tag="Topic" section="interaction.forum"}</th>
<th class="posterth">{str tag="Poster" section="interaction.forum"}</th>
<th class="postscount center">{str tag="Posts" section="interaction.forum"}</th>
<th class="lastpost">{str tag="lastpost" section="interaction.forum"}</th>
{if $moderator}<th class="right btns2"></th>{/if}
</tr>
>>>>>>> Comments on page view (bootstrap)
{if $stickytopics} {if $stickytopics}
{include file="interaction:forum:topics.tpl" topics=$stickytopics moderator=$moderator forum=$forum publicgroup=$publicgroup sticky=true} {include file="interaction:forum:topics.tpl" topics=$stickytopics moderator=$moderator forum=$forum publicgroup=$publicgroup sticky=true}
{/if} {/if}
...@@ -119,7 +77,6 @@ ...@@ -119,7 +77,6 @@
{if $membership && (!$forum->subscribed || $moderator)} {if $membership && (!$forum->subscribed || $moderator)}
<div class="forumselectwrap form-inline ptl"> <div class="forumselectwrap form-inline ptl">
<<<<<<< HEAD
<select name="type" id="action"> <select name="type" id="action">
<option value="default" selected="selected"> <option value="default" selected="selected">
{str tag="chooseanaction" section="interaction.forum"} {str tag="chooseanaction" section="interaction.forum"}
...@@ -173,64 +130,6 @@ ...@@ -173,64 +130,6 @@
<button type="submit" name="updatetopics" class="btn btn-success"> <button type="submit" name="updatetopics" class="btn btn-success">
{str tag="updateselectedtopics" section="interaction.forum"} {str tag="updateselectedtopics" section="interaction.forum"}
</button> </button>
=======
<div class="input-group">
<select name="type" id="action">
<option value="default" selected="selected">
{str tag="chooseanaction" section="interaction.forum"}
</option>
{if !$forum->subscribed}
<option value="subscribe">
{str tag="Subscribe" section="interaction.forum"}
</option>
<option value="unsubscribe">
{str tag="Unsubscribe" section="interaction.forum"}
</option>
{/if}
{if $moderator}
<option value="sticky">
{str tag="Sticky" section="interaction.forum"}
</option>
<option value="unsticky">
{str tag="Unsticky" section="interaction.forum"}
</option>
<option value="closed">
{str tag="Close" section="interaction.forum"}
</option>
<option value="open">
{str tag="Open" section="interaction.forum"}
</option>
{/if}
{if $moderator && $otherforums && (count($otherforums) > 0)}
<option value="moveto">
{str tag="Moveto" section="interaction.forum"}
</option>
{/if}
</select>
{if $moderator && $otherforums && (count($otherforums) > 0)}
<select name="newforum" id="otherforums" class="hidden">
{foreach from=$otherforums item=otherforum}
<option value="{$otherforum->id}">
{$otherforum->title}
</option>
{/foreach}
</select>
{/if}
<div class="input-group-btn">
<button type="submit" name="updatetopics" class="btn btn-success">
{str tag="updateselectedtopics" section="interaction.forum"}
</button>
</div>
</div>
>>>>>>> Comments on page view (bootstrap)
{if $moderator} {if $moderator}
{contextualhelp plugintype='interaction' pluginname='forum' section='updatemod'} {contextualhelp plugintype='interaction' pluginname='forum' section='updatemod'}
...@@ -271,7 +170,7 @@ ...@@ -271,7 +170,7 @@
</div> </div>
{else} {else}
<div class="text-center lead no-result ptxl mtxl"> <div class="no-result pbl">
{str tag="notopics" section="interaction.forum"} {str tag="notopics" section="interaction.forum"}
</div> </div>
</div> </div>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment