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

Commit

Permalink
App Bundle creation
Browse files Browse the repository at this point in the history
  • Loading branch information
rlbaltha committed Dec 1, 2014
1 parent bd83df6 commit 4e9b5af
Show file tree
Hide file tree
Showing 615 changed files with 2,666 additions and 2,014 deletions.
1 change: 0 additions & 1 deletion .idea/frameworkRootSettings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .idea/sustain.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions app/AppKernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@ public function registerBundles()
new FR3D\LdapBundle\FR3DLdapBundle(),
new Ivory\CKEditorBundle\IvoryCKEditorBundle(),
new Sustain\UserBundle\SustainUserBundle(),
new Sustain\CourseBundle\SustainCourseBundle(),
new Sustain\AuthenticateBundle\SustainAuthenticateBundle(),
new Sustain\HomeBundle\SustainHomeBundle(),
new Sustain\AppBundle\AppBundle(),
);

if (in_array($this->getEnvironment(), array('dev', 'test'))) {
Expand Down
6 changes: 3 additions & 3 deletions app/Resources/views/base.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{% block title %}Sustainability Certficate{% endblock %}</title>
<title>{% block title %}Sustainability UGA{% endblock %}</title>

{% block stylesheets %}
{% stylesheets '@bootstrap_less' combine=true output='css/compiled/main.css' %}
<link href="{{ asset_url }}" type="text/css" rel="stylesheet"/>{% endstylesheets %}
<link type="text/css" rel="stylesheet" href="{{ asset('bundles/sustainhome/css/local.css') }}">
<link type="text/css" rel="stylesheet" href="{{ asset('bundles/sustainapp/css/local.css') }}">
{% endblock %}

{% block javascripts %}
Expand Down Expand Up @@ -67,7 +67,7 @@
<div style="margin-top: 51px;">
{% block logo %}
<div class="col-sm-12 ">
<img src="{{ asset('bundles/sustainhome/images/sustain_logo.jpg') }}" class="img-responsive center" alt="Responsive Sustainability Logo">
<img src="{{ asset('bundles/sustainapp/images/sustain_logo.jpg') }}" class="img-responsive center" alt="Responsive Sustainability Logo">
</div>
{% endblock %}

Expand Down
9 changes: 2 additions & 7 deletions app/config/routing.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
sustain_home:
resource: "@SustainHomeBundle/Controller/"
app:
resource: "@AppBundle/Controller/"
type: annotation
prefix: /

Expand Down Expand Up @@ -27,11 +27,6 @@ sustain_authenticate:
type: annotation
prefix: /

sustain_course:
resource: "@SustainCourseBundle/Controller/"
type: annotation
prefix: /

sustain_user:
resource: "@SustainUserBundle/Controller/"
type: annotation
Expand Down
Loading

0 comments on commit 4e9b5af

Please sign in to comment.