diff --git a/{{cookiecutter.repo_name}}/requirements/base.txt b/{{cookiecutter.repo_name}}/requirements/base.txt index d0ef30c0b..4661dfdbf 100644 --- a/{{cookiecutter.repo_name}}/requirements/base.txt +++ b/{{cookiecutter.repo_name}}/requirements/base.txt @@ -33,6 +33,8 @@ django-autoslug==1.7.1 # South==0.8.1 https://bitbucket.org/andrewgodwin/south/get/59f6bae8b1a501ca14a5f23f8b11c44c42f33147.zip +# The ever necessary HAMLpy +hamlpy==0.82.2 # Useful things # django-avatar that work with Django 1.5+ diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/settings.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/settings.py index 75ef95f1c..e0513c989 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/settings.py +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/config/settings.py @@ -169,6 +169,8 @@ class Common(Configuration): ) TEMPLATE_LOADERS = ( + 'hamlpy.template.loaders.HamlPyFilesystemLoader', + 'hamlpy.template.loaders.HamlPyAppDirectoriesLoader', 'django.template.loaders.filesystem.Loader', 'django.template.loaders.app_directories.Loader', ) diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/404.haml b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/404.haml new file mode 100644 index 000000000..894838ec2 --- /dev/null +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/404.haml @@ -0,0 +1,11 @@ +- extends "base.html" + +- block title + Page Not found + +- block page_title + Page Not found + +- block content + %p + This is not the page you were looking for. diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/404.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/404.html deleted file mode 100644 index 3ba605bfa..000000000 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/404.html +++ /dev/null @@ -1,9 +0,0 @@ -{% raw %}{% extends "base.html" %} - -{% block title %}Page Not found{% endblock %} - -{% block page_title %}Page Not found{% endblock page_title %} - -{% block content %} -

This is not the page you were looking for.

-{% endblock content %}{% endraw %} \ No newline at end of file diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/500.haml b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/500.haml new file mode 100644 index 000000000..baa2e2375 --- /dev/null +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/500.haml @@ -0,0 +1 @@ +

Whoops!

\ No newline at end of file diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/500.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/500.html deleted file mode 100644 index 2118bb2cf..000000000 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/500.html +++ /dev/null @@ -1 +0,0 @@ -

Whoops!

diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/base.haml b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/base.haml new file mode 100644 index 000000000..171a06364 --- /dev/null +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/base.haml @@ -0,0 +1,79 @@ +{% load staticfiles i18n %} +!!! +// TODO: find the right way for implementing ng-app to html using hamlpy + + %head + %meta{charset: "utf-8"} + %title + - block title + {{ project_name }} + %meta{content: "width=device-width, initial-scale=1.0", name: "viewport"} + %meta{content: "", name: "description"} + %meta{content: "", name: "author"} + + + / HTML5 shim, for IE6-8 support of HTML5 elements + /[if lt IE 9] + %script{src: "http://html5shim.googlecode.com/svn/trunk/html5.js"} + + - block css + / Latest compiled and minified CSS + %link{href: "//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css", rel: "stylesheet"}/ + + / Optional theme + %link{href: "//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap-theme.min.css", rel: "stylesheet"}/ + + / Your stuff: Third-party css libraries go here + / This file store project specific CSS + %link{href: "{% static 'css/project.css' %}", rel: "stylesheet"}/ + + + + - block angular + %script{src: "//ajax.googleapis.com/ajax/libs/angularjs/1.0.7/angular.min.js"} + + %body + .header.navbar + .container + %a.navbar-brand{href: "/"} + {{cookiecutter.repo_name}} + %ul.nav.navbar-nav + %li.active + %a{href: "{% url 'home' %}"} Home + %li + %a{href: "{% url 'about' %}"} About + - if request.user.is_authenticated + %li + %a{href: "{% url 'users:detail' request.user.username %}"} + {% trans "My Profile" %} + %li + %a{href: "{% url 'account_logout' %}"} + {% trans "Logout" %} + {% else %} + %li + %a{href: "{% url 'account_signup' %}"} + {% trans "Sign Up" %} + %li + %a{href: "{% url 'account_login' %}"} + {% trans "Log In" %} + + + + .container + - block content + %p Use this document as a way to quick start any new project. + + - block modal + + / Placed at the end of the document so the pages load faster + - block javascript + / Latest JQuery + %script{src: "//ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js"} + + / Latest compiled and minified JavaScript + %script{src: "//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"} + + / Your stuff: Third-party javascript libraries go here + / place project specific Javascript in this file + %script{src: "{% static 'js/project.js' %}"} + \ No newline at end of file diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/base.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/base.html deleted file mode 100644 index 70c050191..000000000 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/base.html +++ /dev/null @@ -1,81 +0,0 @@ -{% raw %}{% load staticfiles i18n %} - - - - {% block title %}{{ project_name }}{% endblock title %} - - - - - - - - {% block css %} - - - - - - - - - - - {% endblock %} - - {% block angular %} - - {% endblock %} - - - - - -
-
- {{cookiecutter.repo_name}} - -
-
- -
- - {% block content %} -

Use this document as a way to quick start any new project.

- {% endblock content %} - -
- - {% block modal %}{% endblock modal %} - - - - {% block javascript %} - - - - - - - - - - - {% endblock javascript %} - - - {% endraw %}