From 4ee2840a2b7dab5e0a5dcf36733a46a8f9825b3b Mon Sep 17 00:00:00 2001
From: Shawn Kwang <kwangs@uwm.edu>
Date: Tue, 29 Aug 2017 15:30:07 -0500
Subject: [PATCH 1/2] Drupal: Modified how subscribe link layout. Removed "|"
 for divider, use CSS for a border divider.

Part of https://dev.gridrepublic.org/browse/DBOINCP-309
---
 drupal/sites/default/boinc/themes/boinc/css/pages.css |  5 +++++
 .../boinc/themes/boinc/templates/node-forum.tpl.php   |  4 +++-
 .../themes/boinc/templates/node-team_forum.tpl.php    |  4 +++-
 .../default/boinc/themes/boinc/templates/node.tpl.php | 11 +++++++----
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/drupal/sites/default/boinc/themes/boinc/css/pages.css b/drupal/sites/default/boinc/themes/boinc/css/pages.css
index 1598abb23e..a9b605dc4a 100644
--- a/drupal/sites/default/boinc/themes/boinc/css/pages.css
+++ b/drupal/sites/default/boinc/themes/boinc/css/pages.css
@@ -331,6 +331,11 @@ ul.links li a {
   right: 0;
   text-align: right;
 }
+.subscribe .flag-subscriptions {
+  border-left: 1px solid #808080;
+  margin-left: .1em;
+  padding-left: .5em;
+}
 
 .toc {
   background-color: transparent;
diff --git a/drupal/sites/default/boinc/themes/boinc/templates/node-forum.tpl.php b/drupal/sites/default/boinc/themes/boinc/templates/node-forum.tpl.php
index abde4a6986..14122cd863 100644
--- a/drupal/sites/default/boinc/themes/boinc/templates/node-forum.tpl.php
+++ b/drupal/sites/default/boinc/themes/boinc/templates/node-forum.tpl.php
@@ -99,8 +99,10 @@
       <h2 class="title"><?php print $subtitle; ?></h2>
     </div>
     <div class="subscribe">
+      <?php if (user_access('post comments')): ?>
+        <a href="#block-comment_form_block-comment_form">Post new comment</a>
+      <?php endif; ?>
       <?php if ($subscribe_link): ?>
-        <a href="#block-comment_form_block-comment_form">Post new comment</a> |&nbsp;
         <?php print $subscribe_link; ?>
       <?php endif; ?>
     </div>
diff --git a/drupal/sites/default/boinc/themes/boinc/templates/node-team_forum.tpl.php b/drupal/sites/default/boinc/themes/boinc/templates/node-team_forum.tpl.php
index e99db810a6..b235cc8bfa 100644
--- a/drupal/sites/default/boinc/themes/boinc/templates/node-team_forum.tpl.php
+++ b/drupal/sites/default/boinc/themes/boinc/templates/node-team_forum.tpl.php
@@ -115,8 +115,10 @@
       <h2 class="title"><?php print $subtitle; ?></h2>
     </div>
     <div class="subscribe">
+      <?php if (user_access('post comments')): ?>
+        <a href="#block-comment_form_block-comment_form">Post new comment</a>
+      <?php endif; ?>
       <?php if ($subscribe_link): ?>
-        <a href="#block-comment_form_block-comment_form">Post new comment</a> |&nbsp;
         <?php print $subscribe_link; ?>
       <?php endif; ?>
     </div>
diff --git a/drupal/sites/default/boinc/themes/boinc/templates/node.tpl.php b/drupal/sites/default/boinc/themes/boinc/templates/node.tpl.php
index 3f9305fc43..a5ccb62f5e 100644
--- a/drupal/sites/default/boinc/themes/boinc/templates/node.tpl.php
+++ b/drupal/sites/default/boinc/themes/boinc/templates/node.tpl.php
@@ -74,11 +74,14 @@
  */
 ?>
 
-<?php if ($subscribe_link): ?>
-  <div class="subscribe">
+<div class="subscribe">
+  <?php if (user_access('post comments')): ?>
+    <a href="#block-comment_form_block-comment_form">Post new comment</a>
+  <?php endif; ?>
+  <?php if ($subscribe_link): ?>
     <?php print $subscribe_link; ?>
-  </div>
-<?php endif; ?>
+  <?php endif; ?>
+</div>
 
 <div id="node-<?php print $node->nid; ?>" class="<?php print $classes; ?> clearfix">
   <?php print $user_picture; ?>

From 80f2aa2471e9d2f3f4f823c6eee30c0c6c28ae87 Mon Sep 17 00:00:00 2001
From: Shawn Kwang <kwangs@uwm.edu>
Date: Wed, 6 Sep 2017 11:23:57 -0500
Subject: [PATCH 2/2] Drupal: Changed subscription links to use <ul> and <li>
 tags, and thus CSS classes which set the border between links.

---
 .../default/boinc/themes/boinc/css/pages.css   |  2 --
 .../themes/boinc/templates/node-forum.tpl.php  | 18 ++++++++++++------
 .../boinc/templates/node-team_forum.tpl.php    | 18 ++++++++++++------
 .../boinc/themes/boinc/templates/node.tpl.php  | 18 ++++++++++++------
 4 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/drupal/sites/default/boinc/themes/boinc/css/pages.css b/drupal/sites/default/boinc/themes/boinc/css/pages.css
index a9b605dc4a..6a3fb74a2f 100644
--- a/drupal/sites/default/boinc/themes/boinc/css/pages.css
+++ b/drupal/sites/default/boinc/themes/boinc/css/pages.css
@@ -332,8 +332,6 @@ ul.links li a {
   text-align: right;
 }
 .subscribe .flag-subscriptions {
-  border-left: 1px solid #808080;
-  margin-left: .1em;
   padding-left: .5em;
 }
 
diff --git a/drupal/sites/default/boinc/themes/boinc/templates/node-forum.tpl.php b/drupal/sites/default/boinc/themes/boinc/templates/node-forum.tpl.php
index 14122cd863..2cc309ba60 100644
--- a/drupal/sites/default/boinc/themes/boinc/templates/node-forum.tpl.php
+++ b/drupal/sites/default/boinc/themes/boinc/templates/node-forum.tpl.php
@@ -99,12 +99,18 @@
       <h2 class="title"><?php print $subtitle; ?></h2>
     </div>
     <div class="subscribe">
-      <?php if (user_access('post comments')): ?>
-        <a href="#block-comment_form_block-comment_form">Post new comment</a>
-      <?php endif; ?>
-      <?php if ($subscribe_link): ?>
-        <?php print $subscribe_link; ?>
-      <?php endif; ?>
+      <ul class="links">
+        <?php if (user_access('post comments') AND ($comment==COMMENT_NODE_READ_WRITE)): ?>
+          <li class="first"><a href="#block-comment_form_block-comment_form">Post new comment</a></li>
+          <?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 class="clearfix"></div>
   </div>
diff --git a/drupal/sites/default/boinc/themes/boinc/templates/node-team_forum.tpl.php b/drupal/sites/default/boinc/themes/boinc/templates/node-team_forum.tpl.php
index b235cc8bfa..9c7aedb3e5 100644
--- a/drupal/sites/default/boinc/themes/boinc/templates/node-team_forum.tpl.php
+++ b/drupal/sites/default/boinc/themes/boinc/templates/node-team_forum.tpl.php
@@ -115,12 +115,18 @@
       <h2 class="title"><?php print $subtitle; ?></h2>
     </div>
     <div class="subscribe">
-      <?php if (user_access('post comments')): ?>
-        <a href="#block-comment_form_block-comment_form">Post new comment</a>
-      <?php endif; ?>
-      <?php if ($subscribe_link): ?>
-        <?php print $subscribe_link; ?>
-      <?php endif; ?>
+      <ul class="links">
+        <?php if (user_access('post comments') AND ($comment==COMMENT_NODE_READ_WRITE)): ?>
+          <li class="first"><a href="#block-comment_form_block-comment_form">Post new comment</a></li>
+          <?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 class="clearfix"></div>
   </div>
diff --git a/drupal/sites/default/boinc/themes/boinc/templates/node.tpl.php b/drupal/sites/default/boinc/themes/boinc/templates/node.tpl.php
index a5ccb62f5e..517f4361b5 100644
--- a/drupal/sites/default/boinc/themes/boinc/templates/node.tpl.php
+++ b/drupal/sites/default/boinc/themes/boinc/templates/node.tpl.php
@@ -75,12 +75,18 @@
 ?>
 
 <div class="subscribe">
-  <?php if (user_access('post comments')): ?>
-    <a href="#block-comment_form_block-comment_form">Post new comment</a>
-  <?php endif; ?>
-  <?php if ($subscribe_link): ?>
-    <?php print $subscribe_link; ?>
-  <?php endif; ?>
+  <ul class="links">
+    <?php if (user_access('post comments') AND ($comment==COMMENT_NODE_READ_WRITE)): ?>
+      <li class="first"><a href="#block-comment_form_block-comment_form">Post new comment</a></li>
+      <?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">