Skip to content

Commit

Permalink
MAJB303 : Reprise des view_* et reparamétrage de overall_footer
Browse files Browse the repository at this point in the history
  • Loading branch information
@Alexandre-T
Alexandre-T committed Dec 26, 2013
1 parent 6304488 commit b5aa6b1
Show file tree
Hide file tree
Showing 9 changed files with 228 additions and 198 deletions.
109 changes: 58 additions & 51 deletions phpBBBootstrap/template/overall_footer.html
View file
Original file line number Diff line number Diff line change
@@ -1,64 +1,68 @@
</section>
<nav class="container footer">
<div class="row">
<ul class="breadcrumb">
<li><i class="icon-home"></i>&nbsp;-&nbsp;<a href="{U_INDEX}" accesskey="h">{L_INDEX}</a></li>
<li class="pull-right btn-group">
<!-- IF U_EMAIL_TOPIC --><a class="btn btn-default btn-xs" href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}"><i class="icon-envelope"></i><span class="hidden">{L_EMAIL_TOPIC}</span></a><!-- ENDIF -->
<!-- IF U_EMAIL_PM --><a class="btn btn-default btn-xs" href="{U_EMAIL_PM}" title="{L_EMAIL_PM}" class=""><i class="icon-envelope"></i><span class="hidden">{L_EMAIL_PM}</span></a><!-- ENDIF -->
<!-- IF U_PRINT_TOPIC --><a class="btn btn-default btn-xs" href="{U_PRINT_TOPIC}" title="{L_PRINT_TOPIC}" accesskey="p"><i class="icon-print"></i><span class="hidden">{L_PRINT_TOPIC}</span></a><!-- ENDIF -->
<!-- IF U_PRINT_PM --><a class="btn btn-default btn-xs" href="{U_PRINT_PM}" title="{L_PRINT_PM}" accesskey="p"><i class="icon-print"></i><span class="hidden">{L_PRINT_PM}</span></a><!-- ENDIF -->
<!-- IF not S_IS_BOT -->
<!-- IF S_WATCH_FORUM_LINK --><a class="btn btn-default btn-xs" href="{S_WATCH_FORUM_LINK}" title="{S_WATCH_FORUM_TITLE}"><i class="<!-- IF S_WATCHING_FORUM -->icon-eye-close<!-- ELSE -->icon-eye-open<!-- ENDIF -->"></i> {S_WATCH_FORUM_TITLE}</a><!-- ENDIF -->
<!-- IF U_WATCH_TOPIC --><a class="btn btn-default btn-xs" href="{U_WATCH_TOPIC}" title="{L_WATCH_TOPIC}"><i class="<!-- IF S_WATCHING_TOPIC -->icon-eye-close<!-- ELSE -->icon-eye-open<!-- ENDIF -->"></i> {L_WATCH_TOPIC}</a><!-- ENDIF -->
<!-- IF U_BOOKMARK_TOPIC --><a class="btn btn-default btn-xs" href="{U_BOOKMARK_TOPIC}" title="{L_BOOKMARK_TOPIC}"><i class="icon-bookmark"></i> {L_BOOKMARK_TOPIC}</a><!-- ENDIF -->
<!-- IF U_BUMP_TOPIC --><a class="btn btn-default btn-xs" href="{U_BUMP_TOPIC}" title="{L_BUMP_TOPIC}"><i class="icon-bump"></i> {L_BUMP_TOPIC}</a><!-- ENDIF -->
<!-- ENDIF -->
</li>
<!-- IF S_DISPLAY_POST_INFO -->
<li class="col-md-offset-3 hidden-xs">
<div class=" dropup">
<!-- IF L_FORUM_PERMISSIONS -->
<a class="btn btn-default btn-xs tooltip-link" id="drop-permission" data-toggle="dropdown" href="#" title="{L_FORUM_PERMISSIONS}"><i class="icon-cogs"></i> <span class="visible-md">{L_FORUM_PERMISSIONS}</span> <span class="icon-caret-up"></span></a>
<!-- ELSE -->
<a class="btn btn-default btn-xs tooltip-link" id="drop-permission" data-toggle="dropdown" href="#"><i class="icon-cogs"></i> <span class="visible-md"></span> <span class="icon-caret-up"></span></a>
<div class="breadcrumb">
<div class="row">
<div class="col-sm-5"><i class="icon-home"></i>&nbsp;-&nbsp;<a href="{U_INDEX}" accesskey="h">{L_INDEX}</a></div>
<!-- IF S_DISPLAY_POST_INFO -->
<div class="col-sm-2 hidden-xs text-center">
<div class=" dropup">
<!-- IF L_FORUM_PERMISSIONS -->
<a class="btn btn-default btn-xs tooltip-link" id="drop-permission" data-toggle="dropdown" href="#" title="{L_FORUM_PERMISSIONS}"><i class="icon-cogs"></i>&nbsp;<span class="icon-caret-up"></span></a>
<!-- ELSE -->
<a class="btn btn-default btn-xs tooltip-link" id="drop-permission" data-toggle="dropdown" href="#"><i class="icon-cogs"></i>&nbsp;<span class="icon-caret-up"></span></a>
<!-- ENDIF -->
<ul class="dropdown-menu">
<!-- BEGIN rules --><li class="text-left"><a href="#"><i class="icon-cog"></i> {rules.RULE}</a></li><!-- END rules -->
</ul>
</div>
</div>
<!-- ENDIF -->
<ul class="dropdown-menu">
<!-- BEGIN rules --><li class="text-left"><a href="#"><i class="icon-cog"></i> {rules.RULE}</a></li><!-- END rules -->
</ul>
<div class="<!-- IF ! S_DISPLAY_POST_INFO -->col-sm-offset-2<!-- ENDIF --> col-sm-5 text-right">
<div class="btn-group">
<!-- IF U_EMAIL_TOPIC --><a class="btn btn-default btn-xs tooltip-top" href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}"><i class="icon-envelope"></i><span class="hidden">{L_EMAIL_TOPIC}</span></a><!-- ENDIF -->
<!-- IF U_EMAIL_PM --><a class="btn btn-default btn-xs tooltip-top" href="{U_EMAIL_PM}" title="{L_EMAIL_PM}" class=""><i class="icon-envelope"></i><span class="hidden">{L_EMAIL_PM}</span></a><!-- ENDIF -->
<!-- IF U_PRINT_TOPIC --><a class="btn btn-default btn-xs tooltip-top" href="{U_PRINT_TOPIC}" title="{L_PRINT_TOPIC}" accesskey="p"><i class="icon-print"></i><span class="hidden">{L_PRINT_TOPIC}</span></a><!-- ENDIF -->
<!-- IF U_PRINT_PM --><a class="btn btn-default btn-xs tooltip-top" href="{U_PRINT_PM}" title="{L_PRINT_PM}" accesskey="p"><i class="icon-print"></i><span class="hidden">{L_PRINT_PM}</span></a><!-- ENDIF -->
<!-- IF not S_IS_BOT -->
<!-- IF S_WATCH_FORUM_LINK --><a class="btn btn-default btn-xs tooltip-top" href="{S_WATCH_FORUM_LINK}" title="{S_WATCH_FORUM_TITLE}"><i class="<!-- IF S_WATCHING_FORUM -->icon-eye-close<!-- ELSE -->icon-eye-open<!-- ENDIF -->"></i><span class="hidden">{S_WATCH_FORUM_TITLE}</span></a><!-- ENDIF -->
<!-- IF U_WATCH_TOPIC --><a class="btn btn-default btn-xs tooltip-top" href="{U_WATCH_TOPIC}" title="{L_WATCH_TOPIC}"><i class="<!-- IF S_WATCHING_TOPIC -->icon-eye-close<!-- ELSE -->icon-eye-open<!-- ENDIF -->"></i><span class="hidden">{L_WATCH_TOPIC}</span></a><!-- ENDIF -->
<!-- IF U_BOOKMARK_TOPIC --><a class="btn btn-default btn-xs tooltip-top" href="{U_BOOKMARK_TOPIC}" title="{L_BOOKMARK_TOPIC}"><i class="icon-bookmark"></i><span class="hidden">{L_BOOKMARK_TOPIC}</span></a><!-- ENDIF -->
<!-- IF U_BUMP_TOPIC --><a class="btn btn-default btn-xs tooltip-top" href="{U_BUMP_TOPIC}" title="{L_BUMP_TOPIC}"><i class="icon-arrow-circle-o-up"></i><span class="hidden">{L_BUMP_TOPIC}</span></a><!-- ENDIF -->
<!-- ENDIF -->
</div>
</div>
</li>
<!-- ENDIF -->
</ul>
</div>
</div>
</div>
</nav>

<footer id="bottom" >
<div class="container">
<div class="row">
<div class="col-md-4">
<div class="col-lg-5 col-md-5 hidden-xs">
<ul class="list-unstyled text-muted">
<!-- IF U_TEAM --><li class="rightside"><a href="{U_TEAM}"><small><i class="icon-group"></i> {L_THE_TEAM}</small></a></li><!-- ENDIF -->
<!-- IF not S_IS_BOT --><li class="rightside"><a href="{U_DELETE_COOKIES}"><small><i class="icon-trash"></i> {L_DELETE_COOKIES}</small></a></li><!-- ENDIF -->
<li><small><i class="icon-time"></i> {S_TIMEZONE}</small></li>
</ul>
</div>

<div class="col-md-4">
<div class="col-lg-2 col-md-2 text-center">
<!-- IF S_USER_LOGGED_IN or U_ACP or U_MCP -->
<p class="btn-group text-center">
<!-- IF S_USER_LOGGED_IN --><a href="{U_PROFILE}" class="btn btn-default btn-xs ">{L_PROFILE}</a><!-- ENDIF -->
<!-- IF U_MCP --><a href="{U_MCP}" class="btn btn-xs btn-warning">{L_MCP}</a><!-- ENDIF -->
<!-- IF U_ACP --><a href="{U_ACP}" class="btn btn-xs btn-danger">{L_ACP}</a><!-- ENDIF -->
</p>
<p class="text-center">
<div class="btn-group">
<!-- IF S_USER_LOGGED_IN --><a href="{U_PROFILE}" class="btn btn-default btn-xs tooltip-top" title="{L_PROFILE}"><i class="icon-user"></i><span class="hidden">{L_PROFILE}</span></a><!-- ENDIF -->
<!-- IF U_MCP --><a href="{U_MCP}" class="btn btn-xs btn-warning tooltip-top" title="{L_MCP}"><i class="icon-legal"></i><span class="hidden">{L_MCP}</span></a><!-- ENDIF -->
<!-- IF U_ACP --><a href="{U_ACP}" class="btn btn-xs btn-danger tooltip-top" title="{L_ACP}"><i class="icon-wrench"></i><span class="hidden">{L_ACP}</span></a><!-- ENDIF -->
</div>
<div class="btn-group">
<span class="btn btn-default btn-xs tooltip-top" title="HTML5"><i class="icon-html5"></i></span>
<span class="btn btn-default btn-xs tooltip-top" title="CSS3"><i class="icon-css3"></i></span>
</p>
</div>
<!-- ENDIF -->
</div>

<div class="col-md-4">
<div class="col-lg-5 col-md-5 hidden-xs">
<ul class="list-unstyled text-muted text-right">
<li><small>{CREDIT_LINE}</small></li>
<!-- IF TRANSLATION_INFO --><li><small>{TRANSLATION_INFO}</small></li><!-- ENDIF -->
Expand All @@ -70,27 +74,30 @@
</div>
</footer>
<section>
<div id="popupMP" class="modal hide fade" tabindex="-1">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h3>{L_PRIVATE_MESSAGING}</h3>
</div>
<div class="modal-body">
<p></p>
<p class="text-center"><i class="icon-envelope"></i> {PRIVATE_MESSAGE_INFO}</p>
<p></p>
</div>
<div class="modal-footer">
<a href="#" class="btn btn-default" data-dismiss="modal" aria-hidden="true">{L_CANCEL}</a>
<a href="{U_PRIVATEMSGS}" class="btn btn-primary">{L_GO}</a>
<div class="modal fade" id="popupMP" tabindex="-1" >
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h3>{L_PRIVATE_MESSAGING}</h3>
</div>
<div class="modal-body">
<p class="text-center"><i class="icon-envelope"></i> {PRIVATE_MESSAGE_INFO}</p>
</div>
<div class="modal-footer">
<div class="btn-group">
<a href="#" class="btn btn-default" data-dismiss="modal" aria-hidden="true"><i class="icon-remove"></i>&nbsp;{L_CANCEL}</a>
<a href="{U_PRIVATEMSGS}" class="btn btn-primary"><i class="icon-eye-open"></i>&nbsp;{L_GO}</a>
</div>
</div>
</div>
</div>
</div>
<!-- IF S_USER_PM_POPUP and S_NEW_PM -->
<script type="text/javascript">
$('#popupMP').modal('show');
</script>
<!-- ENDIF -->

</section>
<!-- IF not S_IS_BOT -->{RUN_CRON_TASK}<!-- ENDIF -->
</body>
Expand Down
39 changes: 21 additions & 18 deletions phpBBBootstrap/template/quickreply_editor.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,64 +14,67 @@

function init_qr()
{
dE('qr_editor_div');
dE('qr_showeditor_div');
return true;
return false;
}
onload_functions.push('init_qr();');
// ]]>
</script>
<noscript>
<form method="post" class="form-horizontal" action="{U_QR_ACTION}">
<div class="panel" id="qr_ns_editor_div">
<fieldset class="fields1">
<fieldset>
<legend>{L_QUICKREPLY}</legend>
<div class="form-group">
<label class="control-label" for="subject">{L_SUBJECT} </label>
<div class="controls">
<input type="text" name="subject" id="subject-ns" size="45" maxlength="64" tabindex="2" value="{SUBJECT}" class="col-md-8" />
<label class="control-label col-sm-3" for="subject">{L_SUBJECT} </label>
<div class="col-sm-9">
<input type="text" name="subject" id="subject-ns" size="45" maxlength="64" tabindex="2" value="{SUBJECT}" class="form-control" />
</div>
</div>
<div class="form-group">
<label class="control-label" for="message">{L_MESSAGE} </label>
<div class="controls">
<textarea style="height: 9em;" name="message" rows="7" cols="76" tabindex="3" class="col-md-8"></textarea>
<label class="control-label col-sm-3" for="message">{L_MESSAGE} </label>
<div class="col-sm-9">
<textarea style="height: 9em;" name="message" rows="7" cols="76" tabindex="3" class="form-control"></textarea>
</div>
</div>
</fieldset>
{S_FORM_TOKEN}
{QR_HIDDEN_FIELDS}
<fieldset class="btn-group">
<input type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" class="btn btn-primary" />&nbsp;
<input type="submit" accesskey="f" tabindex="7" name="full_editor" value="{L_FULL_EDITOR}" class="btn btn-default" />&nbsp;
<fieldset class="form-group">
<div class="col-sm-offset-3 col-sm-9 btn-group">
<input type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" class="btn btn-primary" />
<input type="submit" accesskey="f" tabindex="7" name="full_editor" value="{L_FULL_EDITOR}" class="btn btn-default" />
</div>
</fieldset>
</div>
</form>
</noscript>
<form method="post" class="form-horizontal" action="{U_QR_ACTION}">
<div class="row" style="display: none" id="qr_editor_div">
<div class="col-sm-offset-3 col-sm-9">
<div>
<fieldset>
<legend>{L_QUICKREPLY}</legend>
<div class="form-group">
<label class="control-label col-sm-2" for="subject">{L_SUBJECT} </label>
<div class="col-sm-10">
<label class="control-label col-sm-3" for="subject">{L_SUBJECT} </label>
<div class="col-sm-9">
<input type="text" name="subject" id="subject" size="45" maxlength="64" tabindex="2" value="{SUBJECT}" class="form-control" />
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2" for="message">{L_MESSAGE} </label>
<div class="col-sm-10">
<label class="control-label col-sm-3" for="message">{L_MESSAGE} </label>
<div class="col-sm-9">
<textarea style="height: 9em;" name="message" rows="7" cols="76" tabindex="3" class="form-control"></textarea>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10 btn-group">
<div class="col-sm-offset-3 col-sm-9 btn-group">
<button type="submit" accesskey="s" tabindex="6" name="post" class="btn btn-primary"><i class="icon-ok"></i> {L_SUBMIT}</button>
<button type="submit" accesskey="f" tabindex="7" name="full_editor" value="{L_FULL_EDITOR}" class="btn btn-default"><i class="icon-list-alt"></i> {L_FULL_EDITOR}</button>
</div>
</div>
</fieldset>
<a href="" class="bleu pull-right" onclick="hide_qr(false); return false;" title="{L_COLLAPSE_QR}"><i class="icon-double-angle-up"></i> {L_COLLAPSE_QR}</a>
<a href="#" class="bleu pull-right" onclick="hide_qr(false); return false;" title="{L_COLLAPSE_QR}"><i class="icon-double-angle-up"></i> {L_COLLAPSE_QR}</a>
{S_FORM_TOKEN}
{QR_HIDDEN_FIELDS}
</div>
Expand Down
34 changes: 17 additions & 17 deletions phpBBBootstrap/template/topic_actions.html
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<div class="topic-actions">
<div class="row">
<!-- IF not S_IS_BOT and S_DISPLAY_REPLY_INFO -->
<div class="col-sm-4">
<a class="btn <!-- IF S_IS_LOCKED -->btn-danger<!-- ELSE -->btn-default<!-- ENDIF -->" href="{U_POST_REPLY_TOPIC}" title="<!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF -->"><!-- IF S_IS_LOCKED --><i class="icon-white icon-lock"></i> {L_TOPIC_LOCKED_SHORT}<!-- ELSE --><i class="icon-white icon-pencil"></i> {L_POST_REPLY}<!-- ENDIF --></a>
<!-- IF $S_BUTTON_QR -->
<button name="show_qr" tabindex="1" class="btn btn-default" onclick="javascript:hide_qr(true);return false;"><i class="icon-pencil"></i> {L_SHOW_QR}</button>
<!-- ENDIF -->
</div>
<!-- ENDIF -->
<!-- IF PAGINATION or TOTAL_POSTS -->
<div class="col-sm-8 btn-group text-right">
<!-- INCLUDE pagination.html -->
</div>
<!-- ENDIF -->
</div><!-- .row -->
</div>
<div class="row">
<!-- IF not S_IS_BOT and S_DISPLAY_REPLY_INFO -->
<div class="col-sm-4">
<a class="btn <!-- IF S_IS_LOCKED -->btn-danger<!-- ELSE -->btn-default<!-- ENDIF -->" href="{U_POST_REPLY_TOPIC}" title="<!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF -->"><!-- IF S_IS_LOCKED --><i class="icon-white icon-lock"></i> {L_TOPIC_LOCKED_SHORT}<!-- ELSE --><i class="icon-white icon-pencil"></i> {L_POST_REPLY}<!-- ENDIF --></a>
<!-- IF $S_BUTTON_QR -->
<button name="show_qr" tabindex="1" class="btn btn-default" onclick="javascript:hide_qr(true);return false;"><i class="icon-pencil"></i> {L_SHOW_QR}</button>
<!-- ENDIF -->
</div>
<!-- ENDIF -->
<!-- IF PAGINATION or TOTAL_POSTS -->
<div class="col-sm-8">
<div class="pull-right">
<!-- INCLUDE pagination.html -->
</div>
</div>
<!-- ENDIF -->
</div><!-- .row -->
21 changes: 11 additions & 10 deletions phpBBBootstrap/template/viewforum_body.html
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
<!-- INCLUDE overall_header.html -->
<section>
<div class="row">
<div class="col-md-7">
<div class="col-sm-7">
<h2><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2>
</div>
<div class="col-md-5 text-bottom text-right intoh2 hidden-xs">
<div class="col-sm-5 text-bottom text-right intoh2 hidden-xs">
<!-- IF S_DISPLAY_SEARCHBOX -->
<form action="{S_SEARCHBOX_ACTION}" method="get" id="forum-search" >
<fieldset>
<div class="input-group">
<input class="input" type="text" name="keywords" id="search_keywords" size="20" placeholder="{L_SEARCH_FORUM}" />
<button type="submit" class="btn btn-default"><i class="icon-search"></i> {L_SEARCH}</button>
<input class="form-control" type="text" name="keywords" id="search_keywords" size="20" placeholder="{L_SEARCH_FORUM}" />
<div class="input-group-btn">
<button type="submit" class="btn btn-default"><i class="icon-search"></i> {L_SEARCH}</button>
</div>
</div>
{S_SEARCH_LOCAL_HIDDEN_FIELDS}
</fieldset>
Expand Down Expand Up @@ -51,8 +53,7 @@ <h2><a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></h2>

<!-- ENDIF -->
<!-- DEFINE $ALTITUDE = 'text-bottom' -->
<!-- INCLUDE forum_actions.html -->

<!-- INCLUDE forum_actions.html -->
<!-- IF S_NO_READ_ACCESS -->
<div class="alert alert-danger">
<strong>{L_NO_READ_ACCESS}</strong>
Expand Down Expand Up @@ -174,10 +175,10 @@ <h3 class="box-heading"><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a><!-- IF S
<br />{topicrow.LAST_POST_TIME}</small>
</td>
<td class="col-md-2 text-center hidden-xs hidden-sm text-middle">
<span class="label">{topicrow.REPLIES}</span>
<span class="badge">{topicrow.REPLIES}</span>
</td>
<td class="col-md-2 text-center hidden-xs hidden-sm text-middle">
<span class="label" >{topicrow.VIEWS}</span>
<span class="badge" >{topicrow.VIEWS}</span>
</td>
</tr>
<!-- IF topicrow.S_LAST_ROW or not topicrow.S_TOPIC_TYPE_SWITCH -->
Expand All @@ -202,13 +203,13 @@ <h3 class="box-heading"><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a><!-- IF S
</form>

<div class="row hidden-xs">
<div class="col-md-7">
<div class="col-sm-7">
<!-- IF S_DISPLAY_ONLINE_LIST -->
<h3><!-- IF U_VIEWONLINE --><a href="{U_VIEWONLINE}"><i class="icon-map-marker"></i> {L_WHO_IS_ONLINE}</a><!-- ELSE -->{L_WHO_IS_ONLINE}<!-- ENDIF --></h3>
<p>{LOGGED_IN_USER_LIST}</p>
<!-- ENDIF -->
</div>
<div class="col-md-5 text-right intoh2">
<div class="col-sm-5 text-right intoh2">
<!-- INCLUDE jumpbox.html -->
</div>
</div>
Expand Down
Loading

0 comments on commit b5aa6b1

Please sign in to comment.