Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

7.x 1.x soe 3004 footer update #4

Merged
merged 2 commits into from
May 24, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
Stanford SOE Regions

Version 7.x-1.0-dev 2018-05-24
--------------------------------------------------------------------------------
- Fixing footer to match latest stanford_framework page.tpl.php

Version 7.x-1.0-alpha1 2017-07-11
--------------------------------------------------------------------------------

- Initial Release
- Initial Release
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#[Stanford SOE Regions](https://github.com/SU-SOE/stanford_soe_regions)
##### Version: 7.x-1.0-alpha1
##### Version: 7.x-1.0-dev

Maintainers: [boznik](https://github.com/boznik)

Expand Down
2 changes: 1 addition & 1 deletion stanford_soe_regions.info
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ name = Stanford SOE Regions
description = Adds regions to SOE.
core = 7.x
package = Stanford
version = 7.x-1.0-alpha1
version = 7.x-1.0-dev
project = stanford_soe_regions
dependencies[] = regions
24 changes: 12 additions & 12 deletions templates/digital-magazine-page.tpl.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</div>
</div>
</div>
<!-- /#global-header -->
<!-- /#global-header -->
<div id="header" class="clearfix header<?php if ($site_title_first_line): ?> line1<?php endif; ?><?php if ($site_title_second_line): ?> line2<?php endif; ?><?php if ($site_title_line3): ?> line3<?php endif; ?><?php if ($site_title_line4): ?> line4 <?php print $site_title_line4_style; ?><?php endif; ?><?php if ($site_title_line5): ?> line5<?php endif; ?>" role="banner">
<div class="container">
<div class="row">
Expand Down Expand Up @@ -119,7 +119,7 @@
<div class="container"> <?php print render($page['digital_magazine_megamenu']); ?> </div>
</div>
<?php endif; ?>

<?php if ($page['fullwidth_top']): ?>
<div id="fullwidth-top" class="row-fluid fullwidth">
<div class="container"> <?php print render($page['fullwidth_top']); ?> </div>
Expand Down Expand Up @@ -317,16 +317,16 @@
<div class="row">
<div id="bottom-logo" class="span2"><a href="http://www.stanford.edu"><img src="<?php print base_path() . path_to_theme(); ?>/images/[email protected]" alt="Stanford University"></a></div>
<div id="bottom-menu" class="span10">
<ul>
<li><a href="http://www.stanford.edu">SU Home</a></li>
<li><a href="http://visit.stanford.edu/plan/maps.html">Maps &amp; Directions</a></li>
<li><a href="http://www.stanford.edu/search/">Search Stanford</a></li>
<li><a href="http://www.stanford.edu/site/terms.html">Terms of Use</a></li>
<li><a href="http://emergency.stanford.edu/">Emergency Info</a></li>
</ul>
</div>
<div id="copyright" class="span10 offset2">
<p class="vcard">&copy; <span class="fn org">Stanford University</span>, <span class="adr"><span class="locality">Stanford</span>, <span class="region">California</span> <span class="postal-code">94305</span></span>. <span class="copyright-links"><a href="http://www.stanford.edu/site/copyright.html">Copyright Complaints</a></span></p>

<?php foreach ($stanford_links as $class => $link_group): ?>
<ul class="<?php print $class; ?> clearfix">
<?php foreach ($link_group as $link): ?>
<li><?php print $link; ?></li>
<?php endforeach ?>
</ul>
<?php endforeach ?>

<p class="vcard">&copy; <span class="fn org">Stanford University</span>, <span class="adr"><span class="locality">Stanford</span>, <span class="region">California</span> <span class="postal-code">94305</span></span>.</p>
</div>
</div>
</div>
Expand Down