1
0
Fork 0

Basic templating fixes #2

pull/7/head
Pierros Papadeas 2014-08-27 19:42:50 +03:00
parent ee357851a4
commit 83c0a0bb25
6 changed files with 83 additions and 27 deletions

0
SatNOGS/manage.py 100644 → 100755
View File

View File

@ -31,4 +31,17 @@
color: #b94a48;
background-color: #f2dede;
border-color: #eed3d7;
}
.img-avatar {
border: 2px solid white;
border-radius: 50px;
float: left;
margin: 0 auto;
margin-top: -7px;
margin-right: 5px;
}
#main-navbar {
margin-top: 2%;
}

View File

@ -1 +1 @@
<img src="{{ url }}" width="{{ size }}" height="{{ size }}" class="img-thumbnail">
<img src="{{ url }}" width="{{ size }}" height="{{ size }}" class="img-avatar">

View File

@ -1,8 +1,10 @@
{% load staticfiles i18n %}<!DOCTYPE html>
{% load staticfiles i18n %}
{% load avatar_tags %}
<!DOCTYPE html>
<html lang="en" ng-app>
<head>
<meta charset="utf-8">
<title>{% block title %}SatNOGS{% endblock title %}</title>
<title>{% block title %}SatNOGS - Network{% endblock title %}</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="">
@ -14,10 +16,10 @@
{% block css %}
<!-- Latest compiled and minified CSS -->
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
<!-- Optional theme -->
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap-theme.min.css">
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap-theme.min.css">
<!-- Your stuff: Third-party css libraries go here -->
@ -32,23 +34,47 @@
</head>
<body>
<div class="container">
<nav class="navbar navbar-default" role="navigation" id="main-navbar">
<div class="container-fluid">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#">SatNOGS net</a>
</div>
<div class="header navbar">
<div class="container">
<a class="navbar-brand" href="/">SatNOGS</a>
<ul class="nav navbar-nav">
<li class="active"><a href="{% url 'home' %}">Home</a></li>
<li><a href="{% url 'about' %}">About</a></li>
{% if request.user.is_authenticated %}
<li><a href="{% url 'users:detail' request.user.username %}">{% trans "My Profile" %}</a></li>
<li><a href="{% url 'account_logout' %}">{% trans "Logout" %}</a></li>
{% else %}
<li><a href="{% url 'account_signup' %}">{% trans "Sign Up" %}</a></li>
<li><a href="{% url 'account_login' %}">{% trans "Log In" %}</a></li>
{% endif %}
</ul>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
<li class="{% ifequal request.path '/' %}active{% endifequal %}"><a href="{% url 'home' %}">Home</a></li>
<li class="{% ifequal request.path '/about/' %}active{% endifequal %}"><a href="{% url 'about' %}">About</a></li>
</ul>
<ul class="nav navbar-nav navbar-right">
{% if request.user.is_authenticated %}
<li class="dropdown">
<a href="#"
class="dropdown-toggle"
data-toggle="dropdown">{% avatar user 35 %} {{ request.user.username }}
<span class="caret"></span>
</a>
<ul class="dropdown-menu" role="menu">
<li><a href="{% url 'users:detail' request.user.username %}">{% trans "My Profile" %}</a></li>
<li><a href="{% url 'account_logout' %}">{% trans "Logout" %}</a></li>
</ul>
</li>
{% else %}
<li><a href="{% url 'account_signup' %}">{% trans "Sign Up" %}</a></li>
<li><a href="{% url 'account_login' %}">{% trans "Log In" %}</a></li>
{% endif %}
</ul>
</div><!-- /.navbar-collapse -->
</div><!-- /.container-fluid -->
</nav>
</div>
<div class="container">
@ -59,14 +85,23 @@
{% endfor %}
{% endif %}
{% block content %}
<p>Use this document as a way to quick start any new project.</p>
{% endblock content %}
{% block content %}{% endblock content %}
</div> <!-- /container -->
{% block modal %}{% endblock modal %}
<footer>
<div class="container">
<hr>
<p class="pull-right">
<a href="https://github.com/satnogs/satnogs-network">Contribute</a> |
<a href="#">Back to top</a>
</p>
<p>&copy; 2014 SatNOGS Team &middot;</p>
</div>
</footer>
<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
@ -75,7 +110,7 @@
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
<!-- Latest compiled and minified JavaScript -->
<script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
<script src="//netdna.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
<!-- Your stuff: Third-party javascript libraries go here -->

View File

@ -1 +1,5 @@
{% extends "base.html" %}
{% extends "base.html" %}
{% block content %}
<h1>About</h1>
{% endblock content %}

View File

@ -1 +1,5 @@
{% extends "base.html" %}
{% extends "base.html" %}
{% block content %}
<h1>Home</h1>
{% endblock content %}