Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Merge pull request #2080 from drshawnkwang/drupal_fix-forum-top-links 

Drupal: Modified how subscribe link layout.
This commit is contained in:
tristanolive 2017-09-07 22:02:42 -04:00 committed by GitHub
parent 6f5540e750 80f2aa2471
commit efe7064f6e
4 changed files with 41 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drupal/sites/default/boinc/themes/boinc/css/pages.css
View File

@ -331,6 +331,9 @@ ul.links li a {
right: 0; right: 0;
text-align: right; text-align: right;
} }
.subscribe .flag-subscriptions {
padding-left: .5em;
}
.toc { .toc {
background-color: transparent; background-color: transparent;

16
drupal/sites/default/boinc/themes/boinc/templates/node-forum.tpl.php
View File

@ -99,10 +99,18 @@
<h2 class="title"><?php print $subtitle; ?></h2> <h2 class="title"><?php print $subtitle; ?></h2>
</div> </div>
<div class="subscribe"> <div class="subscribe">
<?php if ($subscribe_link): ?> <ul class="links">
<a href="#block-comment_form_block-comment_form">Post new comment</a> |&nbsp; <?php if (user_access('post comments') AND ($comment==COMMENT_NODE_READ_WRITE)): ?>
<?php print $subscribe_link; ?> <li class="first"><a href="#block-comment_form_block-comment_form">Post new comment</a></li>
<?php endif; ?> <?php if ($subscribe_link): ?>
<li class="last"><?php print $subscribe_link; ?></li>
<?php endif; ?>
<?php else: ?>
<?php if ($subscribe_link): ?>
<li class="first"><?php print $subscribe_link; ?></li>
<?php endif; ?>
<?php endif; ?>
</ul>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>

16
drupal/sites/default/boinc/themes/boinc/templates/node-team_forum.tpl.php
View File

@ -115,10 +115,18 @@
<h2 class="title"><?php print $subtitle; ?></h2> <h2 class="title"><?php print $subtitle; ?></h2>
</div> </div>
<div class="subscribe"> <div class="subscribe">
<?php if ($subscribe_link): ?> <ul class="links">
<a href="#block-comment_form_block-comment_form">Post new comment</a> |&nbsp; <?php if (user_access('post comments') AND ($comment==COMMENT_NODE_READ_WRITE)): ?>
<?php print $subscribe_link; ?> <li class="first"><a href="#block-comment_form_block-comment_form">Post new comment</a></li>
<?php endif; ?> <?php if ($subscribe_link): ?>
<li class="last"><?php print $subscribe_link; ?></li>
<?php endif; ?>
<?php else: ?>
<?php if ($subscribe_link): ?>
<li class="first"><?php print $subscribe_link; ?></li>
<?php endif; ?>
<?php endif; ?>
</ul>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>

19
drupal/sites/default/boinc/themes/boinc/templates/node.tpl.php
View File

@ -74,11 +74,20 @@
*/ */
?> ?>
<?php if ($subscribe_link): ?> <div class="subscribe">
<div class="subscribe"> <ul class="links">
<?php print $subscribe_link; ?> <?php if (user_access('post comments') AND ($comment==COMMENT_NODE_READ_WRITE)): ?>
</div> <li class="first"><a href="#block-comment_form_block-comment_form">Post new comment</a></li>
<?php endif; ?> <?php if ($subscribe_link): ?>
<li class="last"><?php print $subscribe_link; ?></li>
<?php endif; ?>
<?php else: ?>
<?php if ($subscribe_link): ?>
<li class="first"><?php print $subscribe_link; ?></li>
<?php endif; ?>
<?php endif; ?>
</ul>
</div>
<div id="node-<?php print $node->nid; ?>" class="<?php print $classes; ?> clearfix"> <div id="node-<?php print $node->nid; ?>" class="<?php print $classes; ?> clearfix">
<?php print $user_picture; ?> <?php print $user_picture; ?>