Skip to content
This repository has been archived by the owner. It is now read-only.

Stormwise - bug fixes and adding social to articles #4

Merged
merged 1 commit into from
Apr 13, 2016
+36 −4
Merged

Stormwise - bug fixes and adding social to articles #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions _notes/dwsync.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@
<dwsync>
<file name="grandchild-styles.css" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="131046161877716516" remote="131046161860000000" Dst="2" />
<file name="grandchild-functions.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="131046073617831410" remote="131046073610000000" Dst="2" />
<file name="template-class.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="131013395250000000" remote="131013395250000000" Dst="2" />
<file name="grandchild-scripts.js" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="131013374400000000" remote="131013374400000000" Dst="2" />
</dwsync>
7 changes: 7 additions & 0 deletions img/_notes/dwsync.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<dwsync>
<file name="linkedin.png" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="131046076110000000" remote="131046076110000000" Dst="2" />
<file name="twitter-bird-white-on-blue.png" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="131046076110000000" remote="131046076110000000" Dst="2" />
<file name="email-icon.png" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="131046076110000000" remote="131046076110000000" Dst="2" />
<file name="asset.f.logo.lg.png" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="131046076110000000" remote="131046076110000000" Dst="2" />
</dwsync>
Binary file added img/asset.f.logo.lg.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/email-icon.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/linkedin.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/twitter-bird-white-on-blue.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion templates/_notes/dwsync.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<dwsync>
<file name="footer.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="131020296231496563" remote="131020296230000000" Dst="1" />
<file name="header.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="131020220764679034" remote="131020220760000000" Dst="1" />
<file name="header.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="131020951020000000" remote="131020951020000000" Dst="2" />
<file name="single.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="131046170364755135" remote="131046170350000000" Dst="2" />
<file name="page-sample.php" server="development.wordpress.uconn.edu/edu.uconn.wordpress.development/public_html/wp-content/" local="131013374400000000" remote="131013374400000000" Dst="2" />
</dwsync>
4 changes: 1 addition & 3 deletions templates/header.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,7 @@
<div id="site-title" class="hidden-xs">
<div class="container">
<?php include get_template_directory().'/inc/header-img.php'; ?>


<div class="row">
<div class="row">
<div class="col-sm-6" id="parent_ag">
<div class="site-branding" id="uc-site-header">
<?php include get_template_directory().'/inc/site-title.php'; ?>
Expand Down
24 changes: 24 additions & 0 deletions templates/page-sample.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?php
/*
* Template Name: Sample
* Sample Page Template
*/
get_header(); ?>
<div id="page-az">
<?php include('../../../themes/cornerstone/inc/sidebar-check.php')?>
<?php while ( have_posts() ) : the_post(); ?>
<?php include('../../../themes/cornerstone/inc/submenu-check.php')?>
<div class="row">
<div class="col-sm-<?php echo (is_active_sidebar( $sidebar )?9:12); ?>">
<div id="primary" class="content-area">
<main id="main" class="site-main" role="main">
Sample content
</main>
</div>
</div>
<?php include('../../../themes/cornerstone/inc/sidebar-if-active.php')?>
</div>
<?php include('../../../themes/cornerstone/inc/submenu-closing-tags.php')?>
<?php endwhile; // end of the loop. ?>
</div>
<?php get_footer(); ?>