1.1 --- a/templates/index.html Sun Dec 29 12:48:13 2013 +0100
1.2 +++ b/templates/index.html Fri Jan 17 12:44:47 2014 +0100
1.3 @@ -3,5 +3,21 @@
1.4 <!-- default jumbotron -->
1.5 {% include "jumbotron-default.html" %}
1.6 {% endblock %}
1.7 -{% block body %}Bewerben{% endblock %}
1.8 +{% block body %}
1.9 + <div class="themen">
1.10 + <div class="container">
1.11 + <div class="col-sm-12">
1.12 + <h1>Stimmen</h1>
1.13 + <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
1.14 + tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
1.15 + quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
1.16 + consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
1.17 + cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
1.18 + proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
1.19 + </div>
1.20 + </div>
1.21 +
1.22 + </div>
1.23
1.24 +{% endblock %}
1.25 +
2.1 --- a/templates/theme.html Sun Dec 29 12:48:13 2013 +0100
2.2 +++ b/templates/theme.html Fri Jan 17 12:44:47 2014 +0100
2.3 @@ -1,157 +1,79 @@
2.4 <!DOCTYPE html>
2.5 <html lang="en"><head>
2.6 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
2.7 - <meta charset="utf-8">
2.8 - <!--meta http-equiv="X-UA-Compatible" content="IE=edge"-->
2.9 - <meta name="viewport" content="width=device-width, initial-scale=1.0">
2.10 - <meta name="description" content="">
2.11 - <meta name="author" content="">
2.12 - <link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico')}}">
2.13 +<meta charset="utf-8">
2.14 +<!--meta http-equiv="X-UA-Compatible" content="IE=edge"-->
2.15 +<meta name="viewport" content="width=device-width, initial-scale=1.0">
2.16 +<meta name="description" content="">
2.17 +<meta name="author" content="">
2.18 +<link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico')}}">
2.19
2.20 - <title>PyMove3D -- 2014</title>
2.21 +<title>PyMove3D -- 2014</title>
2.22
2.23 - <!-- Bootstrap core CSS -->
2.24 - <link href="/static/css/bootstrap.css" rel="stylesheet">
2.25 +<!-- Bootstrap core CSS -->
2.26 +<link href="/static/css/bootstrap.css" rel="stylesheet">
2.27
2.28 - <!-- Just for debugging purposes. Don't actually copy this line! -->
2.29 - <!--[if lt IE 9]><script src="/static/js/ie8-responsive-file-warning.js"></script><![endif]-->
2.30 +<!-- Just for debugging purposes. Don't actually copy this line! -->
2.31 +<!--[if lt IE 9]><script src="/static/js/ie8-responsive-file-warning.js"></script><![endif]-->
2.32
2.33 - <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
2.34 +<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
2.35 <!--[if lt IE 9]>
2.36 <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
2.37 <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
2.38 - <![endif]-->
2.39 - </head>
2.40 + <![endif]-->
2.41 + </head>
2.42
2.43 -<body>
2.44 - <div id="wrap">
2.45 - <header>
2.46 - <!-- Fixed navbar -->
2.47 - <div class="navbar navbar-default" role="navigation">
2.48 - <div class="container">
2.49 - <div class="navbar-header">
2.50 - <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
2.51 - <span class="sr-only">Toggle navigation</span>
2.52 - <span class="icon-bar"></span>
2.53 - <span class="icon-bar"></span>
2.54 - <span class="icon-bar"></span>
2.55 - </button>
2.56 - <a class="navbar-brand" href="/"><img class="logo" src="/static/images/PyMove3D.png" title="PyMove3D" alt="logo pymove3d" /></a>
2.57 - </div>
2.58 - <div class="collapse navbar-collapse">
2.59 - <ul class="nav navbar-nav">
2.60 - {% for href, caption in [('/competition', 'Competition'),
2.61 - ('/task', 'Task'),
2.62 - ('/submission', 'Submission'),
2.63 - ('/coursematerial', 'Coursematerial'),
2.64 - ]:
2.65 - %}
2.66 - {%- if href[1:] == act -%}
2.67 - <li class="active">{% else %} <li>{% endif %}<a href="{{ href }}" >{{ caption }}</a></li>
2.68 - {% endfor %}
2.69 + <body>
2.70 + <div id="wrap">
2.71 + <header>
2.72 + <!-- Fixed navbar -->
2.73 + <div class="navbar navbar-default" role="navigation">
2.74 + <div class="container">
2.75 + <div class="navbar-header">
2.76 + <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
2.77 + <span class="sr-only">Toggle navigation</span>
2.78 + <span class="icon-bar"></span>
2.79 + <span class="icon-bar"></span>
2.80 + <span class="icon-bar"></span>
2.81 + </button>
2.82 + <a class="navbar-brand" href="/"><img class="logo" src="/static/images/PyMove3D.png" title="PyMove3D" alt="logo pymove3d" /></a>
2.83 + </div>
2.84 + <div class="collapse navbar-collapse">
2.85 + <ul class="nav navbar-nav">
2.86 + {% for href, caption in [('/competition', 'Competition'),
2.87 + ('/task', 'Task'),
2.88 + ('/submission', 'Submission'),
2.89 + ('/coursematerial', 'Coursematerial'),
2.90 + ]:
2.91 + %}
2.92 + {%- if href[1:] == act -%}
2.93 + <li class="active">{% else %} <li>{% endif %}<a href="{{ href }}" >{{ caption }}</a></li>
2.94 + {% endfor %}
2.95 + </ul>
2.96 + <ul class="nav navbar-nav navbar-right">
2.97 + <li class="active"><a href="./"> <img class="flags" src="/static/images/flags/de.png" alt="deutsch" />
2.98 + </a></li>
2.99 + <li><a href="../navbar-static-top/"><img class ="flags" src="/static/images/flags/gb.png" alt="english" />
2.100 + </a></li>
2.101 + <li><a href="../navbar-fixed-top/"><img class="flags" src="/static/images/flags/it.png" alt="italiano" />
2.102 + </a></li>
2.103 </ul>
2.104 - <ul class="nav navbar-nav navbar-right">
2.105 - <li class="active"><a href="./"> <img class="flags" src="/static/images/flags/de.png" alt="deutsch" />
2.106 -</a></li>
2.107 - <li><a href="../navbar-static-top/"><img class ="flags" src="/static/images/flags/gb.png" alt="english" />
2.108 -</a></li>
2.109 - <li><a href="../navbar-fixed-top/"><img class="flags" src="/static/images/flags/it.png" alt="italiano" />
2.110 -</a></li>
2.111 - </ul>
2.112 </div><!--/.nav-collapse -->
2.113 </div>
2.114 </div>
2.115 </header>
2.116 - <div id="main">
2.117 - <div class="course">
2.118 - <div class="container">
2.119 - <div class="col-sm-8"> {% block jumbotron %}{% endblock %}</div>
2.120 - <div class="col-sm-4">
2.121 - <div class="well">
2.122 - <img class="img" src="/static/images/jt-coursematerial.png" alt="bild" />
2.123 - </div>
2.124 - </div>
2.125 - <div class="col-sm-4">
2.126 - <div class="panel panel-default">
2.127 - <div class="panel-heading">
2.128 - <h3 class="panel-title"> {% block body %}{% endblock %}</h3>
2.129 - </div>
2.130 - <div class="panel-body">
2.131 - The competition will start on 01.01.2014
2.132 - </div>
2.133 - </div>
2.134 - </div>
2.135 - <div class="col-sm-4">
2.136 - <div class="panel panel-default">
2.137 - <div class="panel-heading">
2.138 - <h3 class="panel-title">Python software Verband</h3>
2.139 - </div>
2.140 - <div class="panel-body">
2.141 - Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
2.142 - tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
2.143 - quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
2.144 - consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
2.145 - cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
2.146 - proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
2.147 - </div>
2.148 - </div>
2.149 - </div>
2.150 - <div class="col-sm-4">
2.151 - <div class="panel panel-default">
2.152 - <div class="panel-heading">
2.153 - <h3 class="panel-title">Fragen</h3>
2.154 - </div>
2.155 - <div class="panel-body">
2.156 - Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
2.157 - tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
2.158 - quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
2.159 - consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
2.160 - cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
2.161 - proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
2.162 - </div>
2.163 - </div>
2.164 - </div>
2.165 - </div>
2.166 - </div><!-- course -->
2.167 - <div class="themen">
2.168 - <div class="container">
2.169 - <div class="col-sm-12">
2.170 - <h1>Stimmen</h1>
2.171 - <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
2.172 - tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
2.173 - quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
2.174 - consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
2.175 - cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
2.176 - proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
2.177 - </div>
2.178 - </div>
2.179 -
2.180 - </div>
2.181 - <div class="partner">
2.182 - <div class="container">
2.183 - <div class="col-sm-12">
2.184 - <h1>Sponsoren</h1>
2.185 - <ul class="list-inline">
2.186 - <li><a href="">Logo</a></li>
2.187 - <li><a href="">Logo</a></li>
2.188 - <li><a href="">Logo</a></li>
2.189 - <li><a href="">Logo</a></li>
2.190 - <li><a href="">Logo</a></li>
2.191 - <li><a href="">Logo</a></li>
2.192 - </ul>
2.193 - </div>
2.194 - </div>
2.195 -
2.196 - </div>
2.197 -
2.198 - </div><!-- /main -->
2.199 -</div> <!-- /wrap -->
2.200 -{% include "footer.html" %}
2.201 + <div id="main">
2.202 +
2.203 + {% block body %}{% endblock %}
2.204 + </div><!-- /main -->
2.205 + </div> <!-- /wrap -->
2.206 + {% include "footer.html" %}
2.207 <!-- Bootstrap core JavaScript
2.208 ================================================== -->
2.209 <!-- Placed at the end of the document so the pages load faster -->
2.210 <script src="/static/js/jquery-1.10.2.min.js"></script>
2.211 <script src="static/js/bootstrap.js"></script>
2.212 -
2.213 +
2.214
2.215 -</body></html>
2.216 + </body>
2.217 + </html>