Merge branch 'master' of github.uconn.edu:dmd-web-and-mobile/ationfra…

…mework
dmd-web-and-mobile · Apr 27, 2016 · 9abe3f1 · 9abe3f1
2 parents 655a84f + 5fc46bf
commit 9abe3f1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/appspec.yml b/appspec.yml
@@ -43,7 +43,7 @@ files:
 # If you are not running any commands on the Amazon EC2 instance, then remove
 #   the "hooks" section altogether. A blank or incomplete "hooks" section
 #   may cause associated deployments to fail.
-# hooks:
+hooks:
 # For each deployment lifecycle event, specify multiple "location" entries
 #   if you want to run multiple scripts during that event.
 # You can specify "timeout" as the number of seconds to wait until failing the deployment
@@ -76,8 +76,8 @@ files:
   #     runas:
 # During the BeforeInstall deployment lifecycle event, run the commands
 #   in the script specified in "location".
-BeforeInstall:
-  - location: beforeinstall.sh
+  BeforeInstall:
+    - location: beforeinstall.sh
 # During the AfterInstall deployment lifecycle event, run the commands
 #   in the script specified in "location".
   # AfterInstall:

diff --git a/www/wp-config.php b/www/wp-config.php
@@ -172,13 +172,13 @@
 
     // Load defaults
 
-    define('DB_NAME', 'wordpress');
+    define('DB_NAME', 'ation');
 
-    define('DB_USER', 'root');
+    define('DB_USER', 'ation');
 
-    define('DB_PASSWORD', 'wordpresspw');
+    define('DB_PASSWORD', 'ationmedia');
 
-    define('DB_HOST', 'mysql');
+    define('DB_HOST', 'develop.digitalmediauconn.org');
 
     define('DB_CHARSET', 'utf8');
 

diff --git a/www/wp-content/themes/ation2016/templates/page-about.twig b/www/wp-content/themes/ation2016/templates/page-about.twig
@@ -14,15 +14,13 @@
 			<div class="row">
 				{% if semester.members %}
 					{% for member in semester.members %}
-						<div class="col-xs-12 col-sm-6 col-md-4 col-lg-3">
-							<a href="{{ member.link }}">
-								{% if member.get_thumbnail %}
+						{% if member.get_thumbnail %}
+							<div class="col-xs-12 col-sm-6 col-md-4 col-lg-3">
+								<a href="{{ member.link }}">
 									<img src="{{ member.get_thumbnail.get_src|resize(600,600) }}" class="img-responsive greyscale"/>
-								{% else %}
-									{# <p>{{ member.name }}</p> #}
-								{% endif %}
-							</a>
-						</div>
+								</a>
+							</div>
+						{% endif %}
 					{% endfor %}
 				{% else %}
 					<div class="col-xs-12">