diff options
| -rw-r--r-- | forums/wsgi.py | 4 | ||||
| -rw-r--r-- | static/forums/templates/user-login.html | 2 | ||||
| -rw-r--r-- | static/website/css/main.css | 26 | ||||
| -rw-r--r-- | static/website/templates/base.html | 12 | ||||
| -rw-r--r-- | static/website/templates/user-questions.html | 2 | ||||
| -rw-r--r-- | static/website/templates/user-replies.html | 2 |
6 files changed, 28 insertions, 20 deletions
diff --git a/forums/wsgi.py b/forums/wsgi.py index 728eed4..3a52e8b 100644 --- a/forums/wsgi.py +++ b/forums/wsgi.py @@ -24,8 +24,8 @@ sys.path.append('/Sites/venv/forums/') # os.environ["DJANGO_SETTINGS_MODULE"] = "forums.settings" os.environ["DJANGO_SETTINGS_MODULE"] = "forums.settings" -activate_this = '/Sites/venv/bin/activate_this.py' -execfile(activate_this, dict(__file__=activate_this)) +#activate_this = '/Sites/venv/bin/activate_this.py' +#execfile(activate_this, dict(__file__=activate_this)) # This application object is used by any WSGI server configured to use this # file. This includes Django's development server, if the WSGI_APPLICATION diff --git a/static/forums/templates/user-login.html b/static/forums/templates/user-login.html index 27f5a1f..a1951fe 100644 --- a/static/forums/templates/user-login.html +++ b/static/forums/templates/user-login.html @@ -32,7 +32,7 @@ </ul> <h4>Dont have a Spoken-Tutorial.org account yet ?</h4> <p> - <a class="btn btn-sm btn-success" href="#">Register</a> + <a class="btn btn-sm btn-success" href="http://www.spoken-tutorial.org/user/register" target="_blank">Register</a> </p> </div> <!-- /.col --> </div> <!-- /.row --> diff --git a/static/website/css/main.css b/static/website/css/main.css index 543de18..4280d57 100644 --- a/static/website/css/main.css +++ b/static/website/css/main.css @@ -1,4 +1,7 @@ /* override bootstrap */ +.container>.navbar-header { + height: 45px; +} .navbar>.container .navbar-brand { margin-left: 0; } @@ -26,6 +29,10 @@ body { #header-inner { } +#logo { + width: 25px; + margin-top: -3px; +} #content-wrapper { position: relative; max-width: 970px; @@ -134,10 +141,14 @@ body { max-width: 970px; margin:0 auto; background-color: #2d2d2d; - min-height: 60px; + color: #ffffff; } #footer-inner { - + padding-top: 10px; + padding-bottom: 10px; +} +#footer-inner a{ + color: #ffffff; } .field_error { border: 1px solid red; @@ -168,14 +179,3 @@ body { right: 5px; bottom: 5px; } -#search-bar { - display: none; - min-height: 50px; - padding-top: 15px; - padding-bottom: 15px; - background: #ffffff; - border-bottom: 2px solid #f5f5f5; - width: 970px; - margin: 0 auto; -} - diff --git a/static/website/templates/base.html b/static/website/templates/base.html index dccb556..49c5f18 100644 --- a/static/website/templates/base.html +++ b/static/website/templates/base.html @@ -20,6 +20,7 @@ <span class="icon-bar"></span> </button> <a class="navbar-brand" href="{% url 'website:home' %}"> + <img id="logo" src="http://spoken-tutorial.org/sites/all/themes/spoken/images/logo.png"> Spoken Tutorial Forums </a> </div> <!-- /.navbar-header --> @@ -85,11 +86,18 @@ </div> <!-- /#content-inner --> </div> <!-- /#content-wrapper --> - <div id="footer-wrapper"> - <div id="footer-inner" class="container"> + <div id="footer-wrapper" class="container"> + <div id="footer-inner" class="col-lg-12 col-md-12 col-sm-12"> <div class="pull-left"> + <!--[if lte IE 8]><span style="filter: FlipH; -ms-filter: "FlipH"; display: inline-block;"><![endif]--> + <span style="-moz-transform: scaleX(-1); -o-transform: scaleX(-1); -webkit-transform: scaleX(-1); transform: scaleX(-1); display: inline-block;"> + <a href="http://www.gnu.org/copyleft/" target="_blank">©</a> + </span> + <!--[if lte IE 8]></span><![endif]--> + 2013 <a href="http://spoken-tutorial.org" target="_blank">spoken-tutorial.org</a> </div> <div class="pull-right"> + Developed at IIT Bombay </div> </div> <!-- /#footer-inner --> </div> <!-- /#footer-wrapper --> diff --git a/static/website/templates/user-questions.html b/static/website/templates/user-questions.html index e3d2ab6..69b3b4b 100644 --- a/static/website/templates/user-questions.html +++ b/static/website/templates/user-questions.html @@ -5,7 +5,7 @@ {% for question in questions %} <div class="my-question"> <span class="title"> - {{ question.title }} + <a href="{% url 'website:get_question' question.id %}">{{ question.title }}</a> </span> <br> <span class="date"> diff --git a/static/website/templates/user-replies.html b/static/website/templates/user-replies.html index c31b854..8be85fa 100644 --- a/static/website/templates/user-replies.html +++ b/static/website/templates/user-replies.html @@ -5,7 +5,7 @@ {% for reply in replies%} <div class="my-reply"> <span class="body"> - {{ reply.body|safe }} + <a href="{% url 'website:get_question' reply.question.id %}#reply{{ reply.id }}">{{ reply.body|safe }}</a> </span> <br> <span class="date"> |