Skip to content
This repository has been archived by the owner on Nov 16, 2021. It is now read-only.

Commit

Permalink
Merge branch 'update'
Browse files Browse the repository at this point in the history 
Conflicts:
	app/config/config.yml
	src/Sustain/AppBundle/Entity/Section.php
	src/Sustain/AppBundle/Resources/views/Page/home.html.twig
	src/Sustain/AppBundle/Resources/views/Section/index.html.twig
  • Loading branch information
@rlbaltha
rlbaltha committed Jun 19, 2017
2 parents ed16249 + cdd3a9d commit e9d88c1
Show file tree
Hide file tree
Showing 99 changed files with 2,828 additions and 4,742 deletions.
21 changes: 0 additions & 21 deletions .idea/sustain.iml
View file

This file was deleted.

7 changes: 4 additions & 3 deletions app/AppKernel.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,23 @@ public function registerBundles()
new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
new FOS\UserBundle\FOSUserBundle(),
new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
new JMS\SerializerBundle\JMSSerializerBundle(),
new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
new Knp\Bundle\PaginatorBundle\KnpPaginatorBundle(),
new Knp\Bundle\GaufretteBundle\KnpGaufretteBundle(),
new Vich\UploaderBundle\VichUploaderBundle(),
new Knp\Bundle\SnappyBundle\KnpSnappyBundle(),
new FR3D\LdapBundle\FR3DLdapBundle(),
new Ivory\CKEditorBundle\IvoryCKEditorBundle(),
new Sustain\UserBundle\SustainUserBundle(),
new Sustain\AuthenticateBundle\SustainAuthenticateBundle(),
new BeSimple\SsoAuthBundle\BeSimpleSsoAuthBundle(),
new AntiMattr\GoogleBundle\GoogleBundle(),
new Sustain\AppBundle\AppBundle(),
);

if (in_array($this->getEnvironment(), array('dev', 'test'))) {
$bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
$bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
$bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();
}

return $bundles;
Expand Down
2 changes: 1 addition & 1 deletion ...teBundle/Resources/views/layout.html.twig → ...rces/FOSUserBundle/views/layout.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</script>

<div class="col-sm-offset-4 col-sm-4 col-xs-12 ">
<div class="panel panel-default" style="margin-top: 30px;">
<div class="card" style="margin-top: 30px;">
<div class="panel-body">
<div style="text-align:center;">
<h1 class="margin-top-small">{{ application_name }}.</h1>
Expand Down
247 changes: 152 additions & 95 deletions app/Resources/views/base.html.twig
View file

Large diffs are not rendered by default.

124 changes: 124 additions & 0 deletions app/Resources/views/default/index.html.twig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
{% extends 'base.html.twig' %}

{% block sidebar %}{% endblock %}
{% block body %}

<!-- Wrap the rest of the page in another container to center all the content. -->

<div class="container-fluid">

<!-- Two columns of text below the carousel -->


<div class="row">
{% if announcement is defined %}
<div class="col-sm-12" style="margin-top: -5em">
{{ announcement.body|raw }}
</div>
{% endif %}

<div class="col-sm-6">
<h2>Contact US</h2>
<div class="card">
<div class="card-block">
<p>If you have questions, please send an email to [email protected]. </p>
</div>
</div>

<h2>Join our mailing list!</h2>
<div class="card">
<div class="card-block">


<p>Please send your name and email to <strong>[email protected]</strong> to get email updates on
Watershed UGA. Please note if you are a
student,
a member of the community, or a faculty member in the email. </p>
</div>
</div>

<h2>Events</h2>
<div class="card">
<div class="card-block">
<iframe style="border:none;width:100%;"
src="https://uga.givepulse.com/w/23030146caeb82fa4b1288952c5df633?"></iframe>
</div>
</div>
<div class="card">
<div class="card-block">
<a title="Events" href="{{ path('event') }}">See all upcoming events</a>
{% for event in events %}
<h3>{{ event.title }}</h3>
<p>{% if event.start %}{{ event.start|date("l, F d") }} {{ event.start|date("g:i A") }}{% endif %}</p>
<p>{% if event.location!='' %}{{ event.location }}{% endif %}</p>
<p>{{ event.teaser|raw }}</p>
<hr/>
{% else %}
<p>There are no events at this time. Please check back soon.</p>
{% endfor %}
</div>
</div>
<div class="card">
<div class="card-block">
<a class="twitter-timeline" href="https://twitter.com/WatershedUGA"
data-widget-id="644610687554162689">Tweets
by @WatershedUGA</a>
<script>!function (d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0], p = /^http:/.test(d.location) ? 'http' : 'https';
if (!d.getElementById(id)) {
js = d.createElement(s);
js.id = id;
js.src = p + "://platform.twitter.com/widgets.js";
fjs.parentNode.insertBefore(js, fjs);
}
}(document, "script", "twitter-wjs");</script>
</div>
</div>

<h3>Watch our Introductory Video</h3>
<div class="card">
<div class="card-block">
<div class="embed-responsive embed-responsive-4by3">
<iframe class="embed-responsive-item" src="https://www.youtube.com/embed/mZvlSWSNsJw?rel=0"
frameborder="0" allowfullscreen></iframe>
</div>
</div>
</div>
</div><!-- /.col-sm-6 -->

<div class="col-sm-6 ">



<h2>Stories</h2>

<div class="card">
<div class="card-block">
<a href="{{ path('section') }}">Read all our stories</a>
{% for page in pages %}
<h3>{{ page.teaserImageCaption }}</h3>
<a href="{{ path('page_show', {id:page.id}) }}"
title="Read more about {{ page.menuName }} ">
<img src="{{ page.teaserImage }}" class="img-responsive img-thumbnail"
alt="{{ page.menuName }}">
</a>

<div class="caption">
<p>{{ page.teaser|raw }}</p>
</div>
<a href="{{ path('page_show', {id:page.id}) }}"
title="Read more about {{ page.menuName }} ">
Read more about {{ page.teaserImageCaption }}
</a>
<hr/>
{% endfor %}
</div>
</div>
</div><!-- /.col-sm-6 -->
</div><!-- /.row -->


</div><!-- /.container -->


{% endblock %}
Loading

0 comments on commit e9d88c1

Please sign in to comment.