Updating WP themes

MicroPasts · Oct 16, 2014 · ce7c42e · ce7c42e
1 parent bf89956
commit ce7c42e
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 38 deletions.
diff --git a/micropasts/footer.php b/micropasts/footer.php
@@ -15,7 +15,7 @@
              <li><i class="fa fa-facebook-square" style="color:white"></i> <a href="http://facebook.com/micropasts">Facebook</a></li>  
              <li><i class="fa fa-flickr" style="color:white"></i> <a href="https://www.flickr.com/photos/micropasts">Flickr</a></li>
           </ul>
-       </div>	 
+       </div>  
     </div>  
 </div>
 

diff --git a/micropasts/front-page.php b/micropasts/front-page.php
@@ -21,7 +21,7 @@
       <div class="jumbotron-small col-md-4">
          <h3>Research you fund</h3>
          <p>Choose among new proposals for research and help to crowd-fund them.</p>     
-         <p><a class="btn btn-primary" href="http://micropasts.org/crowdfunding/">View details <i class="fa fa-chevron-right"></i></a></p>
+         <p><a class="btn btn-primary" href="https://crowdfunded.micropasts.org/">View details <i class="fa fa-chevron-right"></i></a></p>
       </div>
       <div class="jumbotron-small col-md-4">
          <h3>Discuss and design</h3>

diff --git a/micropasts/header.php b/micropasts/header.php
@@ -37,7 +37,7 @@
       <div class="navbar-collapse collapse">  
          <ul class="nav navbar-nav">
             <li><a href="http://crowdsourced.micropasts.org/">Crowd-sourcing</a></li>
-            <li<?php if (is_page('Crowd-funding')) { echo " class=\"active\""; }?>><a href="/crowdfunding">Crowd-funding</a></li>
+            <li><a href="https://crowdfunded.micropasts.org/">Crowd-funding</a></li>
             <li><a href="http://community.micropasts.org">Forum</a></li>
             <li<?php if (is_page('data-centre')) { echo " class=\"active\""; }?>><a href="/data-centre">Data</a></li>
             <li<?php if (is_page('learning')) { echo " class=\"active\""; }?>><a href="/learning">Learning</a></li>

diff --git a/micropasts/home.php b/micropasts/home.php
@@ -6,8 +6,8 @@
 
     <?php if ( have_posts() ) : while ( have_posts() ) : the_post(); ?>
     <h2><a href="<?php the_permalink(); ?>"><?php the_title(); ?></a></h2>
-  	<p><em><?php the_time('l, F jS, Y'); ?></em></p>
-  	<hr>
+    <p><em><?php the_time('l, F jS, Y'); ?></em></p>
+    <hr>
 
     <?php endwhile; else: ?>
       <p><?php _e('Sorry, there are no posts.'); ?></p>

diff --git a/micropasts/index.php b/micropasts/index.php
@@ -1,9 +1,9 @@
 <?php get_header(); ?>
 
         <?php if ( have_posts() ) : while ( have_posts() ) : the_post(); ?>
-	  	<?php the_content(); ?>
+      <?php the_content(); ?>
 
-	<?php endwhile; else: ?>
+   <?php endwhile; else: ?>
 
 <div class="wrap">
 <div class="top-container"></div>
@@ -23,6 +23,6 @@
 <div class="push"></div>
 </div>
 
-	<?php endif; ?>
+   <?php endif; ?>
 
 <?php get_footer(); ?>
diff --git a/micropasts/style.css b/micropasts/style.css
@@ -69,7 +69,11 @@ body {
   padding-left: 27px; 
   text-align: left;
 }
-
+.tdstyle {
+  font-size: 14px;
+  font-family: Arial, Helvetica, Sans-Serif;
+  text-align: left;
+}
 
 /* HEADER */
 
@@ -194,14 +198,14 @@ body {
 .jumbotron-page p {
   padding: 3px;
   text-align: left;
-  font-size: 14px;	
+  font-size: 14px;  
 }
 .jumbotron-page h3, h4 {
   text-align:left;
-  padding-top: 15px;	
+  padding-top: 15px;  
 }
 .jumbotron-page ul {
-  text-align:left;	
+  text-align:left;  
 }
 .jumbotron-small p {
   text-align: left;
@@ -210,7 +214,7 @@ body {
 .jumbotron-small h3 {
   text-align: left;
   font-size: 18px;
-  font-weight: bold;	
+  font-weight: bold;  
 }
 
 

diff --git a/wpbootstrap/footer.php b/wpbootstrap/footer.php
@@ -14,7 +14,7 @@
              <li><i class="fa fa-facebook-square" style="color:white"></i> <a href="http://facebook.com/micropasts">Facebook</a></li>  
              <li><i class="fa fa-flickr" style="color:white"></i> <a href="https://www.flickr.com/photos/micropasts">Flickr</a></li>  
           </ul>
-       </div>	 
+       </div>  
     </div>  
 </div>
 

diff --git a/wpbootstrap/header.php b/wpbootstrap/header.php
@@ -36,21 +36,20 @@
       </div>  
       <div class="navbar-collapse collapse">  
          <ul class="nav navbar-nav">
-            <li><a href="http://crowdsourced.micropasts.org/">Crowd-sourcing</a></li>
-            <li<?php if (is_page('Crowd-funding')) { echo " class=\"active\""; }?>><a href="/crowdfunding">Crowd-funding</a></li>
-            <li><a href="http://community.micropasts.org">Forum</a></li>
-            <!-- li<?php if (is_page('data-centre')) { echo " class=\"active\""; }?>><a href="/data-centre">Data</a></li -->
-            <!-- li<?php if (is_page('learning')) { echo " class=\"active\""; }?>><a href="/learning">Learning</a></li -->
-            <li<?php if (is_page('About')) { echo " class=\"active\""; }?>><a href="/about">About</a></li>
-            <!-- li><a href="http://research.micropasts.org">Blog</a></li -->
-            <li class="dropdown">
-               <a href="#" class="dropdown-toggle" data-toggle="dropdown">Research <b class="caret"></b></a>
-               <ul class="dropdown-menu">
-                  <li<?php if (is_page('data-centre')) { echo " class=\"active\""; }?>><a href="/data-centre">Data</a></li>
-                  <li<?php if (is_page('learning')) { echo " class=\"active\""; }?>><a href="/learning">Learning</a></li>
-                  <li><a href="http://research.micropasts.org">Blog</a></li>
-               </ul>
-            </li>
+
+      <!-- menu changes to reflect CS site -->  
+            <li><a href="#">Home</a></li>
+      <li><a href="#">Contributors</a></li>
+      <li><a href="#">Applications</a></li>
+      <li<?php if (is_page('About')) { echo " class=\"active\""; }?>><a href="/about">About</a></li>
+      <li><a href="http://community.micropasts.org">Forum</a></li>
+            <li<?php if (is_page('data-centre')) { echo " class=\"active\""; }?>><a href="/data-centre">Data</a></li>
+            <li<?php if (is_page('learning')) { echo " class=\"active\""; }?>><a href="/learning">Learning</a></li>
+            <li><a href="http://research.micropasts.org">Blog</a></li>
+
+            <!-- li><a href="http://crowdsourced.micropasts.org/">Crowd-sourcing</a></li>
+            <li<?php if (is_page('Crowd-funding')) { echo " class=\"active\""; }?>><a href="/crowdfunding">Crowd-funding</a></li -->
+
          </ul>
       </div>
 

diff --git a/wpbootstrap/home.php b/wpbootstrap/home.php
@@ -6,8 +6,8 @@
 
     <?php if ( have_posts() ) : while ( have_posts() ) : the_post(); ?>
     <h2><a href="<?php the_permalink(); ?>"><?php the_title(); ?></a></h2>
-  	<p><em><?php the_time('l, F jS, Y'); ?></em></p>
-  	<hr>
+    <p><em><?php the_time('l, F jS, Y'); ?></em></p>
+    <hr>
 
     <?php endwhile; else: ?>
       <p><?php _e('Sorry, there are no posts.'); ?></p>

diff --git a/wpbootstrap/index.php b/wpbootstrap/index.php
@@ -1,9 +1,9 @@
 <?php get_header(); ?>
 
         <?php if ( have_posts() ) : while ( have_posts() ) : the_post(); ?>
-	  	<?php the_content(); ?>
+      <?php the_content(); ?>
 
-	<?php endwhile; else: ?>
+   <?php endwhile; else: ?>
 
 <div class="wrap">
 <div class="top-container"></div>
@@ -23,6 +23,6 @@
 <div class="push"></div>
 </div>
 
-	<?php endif; ?>
+   <?php endif; ?>
 
 <?php get_footer(); ?>
diff --git a/wpbootstrap/style.css b/wpbootstrap/style.css
@@ -196,14 +196,14 @@ body {
 .jumbotron-page p {
   padding: 3px;
   text-align: left;
-  font-size: 14px;	
+  font-size: 14px;  
 }
 .jumbotron-page h3, h4 {
   text-align:left;
-  padding-top: 15px;	
+  padding-top: 15px;  
 }
 .jumbotron-page ul {
-  text-align:left;	
+  text-align:left;  
 }
 .jumbotron-small p {
   text-align: left;
@@ -212,7 +212,7 @@ body {
 .jumbotron-small h3 {
   text-align: left;
   font-size: 18px;
-  font-weight: bold;	
+  font-weight: bold;  
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ @@
                  <li><i class="fa fa-facebook-square" style="color:white"></i> <a href="http://facebook.com/micropasts">Facebook</a></li>
                  <li><i class="fa fa-flickr" style="color:white"></i> <a href="https://www.flickr.com/photos/micropasts">Flickr</a></li>
               </ul>
-           </div>
+           </div>
         </div>
     </div>
@@ Expand Down @@