FVDE/ennstatus Changeset - 994cf6c34ccf · Chaos Computer Club Lëtzebuerg Projects

Changeset - 994cf6c34ccf

Parent rev.

Child rev.

[Not reviewed]

version_5

0 2 0

Dennis Fink - 10 years ago 2015-07-19 04:48:08
dennis.fink@c3l.lu

Beginning major redesign of ennstatus

2 files changed with 40 insertions and 67 deletions:

ennstatus/static/css/ennstatus.css

ennstatus/templates/base.html

0 comments (0 inline, 0 general)

ennstatus/static/css/ennstatus.css

➞

Show inline comments

 blockquote {
     border: none;
+}
 .thumbnail {
     border: none;
+}
 .container {
     margin-top:1%;
+}
 .navbar-default {
    background-color: #00ae18;
+}
 .navbar-default .navbar-brand {
    color: #fff;
+}
 .navbar-default .navbar-nav > li > a {
    color: #fff;
+}
 .dropdown-menu {
    background-color: #00ae18;
+}
 .dropdown-menu > li > a:hover {
    background-color: #00bf1a;
+}

ennstatus/templates/base.html

➞

Show inline comments

@@ @@ -24,103 +24,56 @@ @@
 <div class="container">
   {% block navbar %}
   <div class="navbar navbar-default">
     <div class="navbar-header">
       <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
       <a class="navbar-brand" href="{{ url_for('root.index') }}">Enn.lu</a>
     </div>
     <div class="navbar-collapse collapse">
       <ul class="nav navbar-nav navbar-left">
         <li>
           {% if '.onion' in request.url_root %}
             <a href="//{{ config['ENNSTATUS_WIKI_ONION_ADDRESS'] }}/doku.php?id=news">News</a>
           {% elif '.bit' in request.url_root %}
             <a href="//{{ config['ENNSTATUS_WIKI_BIT_ADDRESS'] }}/doku.php?id=news">News</a>
           {% else %}
             <a href="//wiki.enn.lu/doku.php?id=news">News</a>
           {% endif %}
         </li>
         <li>
           <a href="{{ url_for('root.about') }}">About</a>
         </li>
         <li>
           <a href="{{ url_for('root.services') }}">Services</a>
         </li>
       <ul class="nav navbar-nav">
         <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown">Donate <b class="caret"></b></a>
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown">About <b class="caret"></b></a>
           <ul class="dropdown-menu">
             <li><a href="{{ url_for('donate.index') }}">Support us</a></li>
             <li><a href="{{ url_for('donate.wiretransfer') }}">Wiretransfer</a></li>
             <li><a href="{{ url_for('donate.snailmail') }}">Snailmail</a></li>
             <li><a href="{{ url_for('donate.paypal') }}">PayPal</a></li>
             <li><a href="{{ url_for('donate.bitcoin') }}">Bitcoin</a></li>
             <li><a href="{{ url_for('donate.flattr') }}">Flattr</a></li>
             <li><a href="{{ url_for('donate.bpm') }}">BPM</a></li>
             <li class="divider"></li>
             <li><a href="{{ url_for('donate.received') }}">Received Donations</a></li>
             <li><a>Who we are</a></li>
             <li><a>What we do?</a></li>
             <li><a>Our partners</a></li>
           </ul>
         </li>
         <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown">Partners <b class="caret"></b/></a>
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown">Services <b class="caret"></b></a>
           <ul class="dropdown-menu">
             <li><a href="{{ url_for('root.partners') }}">Official Partners</a></li>
             <li><a href="{{ url_for('root.bridgeprogram') }}">Bridge Program</a></li>
           </ul>
         </li>
         <li>
           <a href="{{ url_for('root.contact') }}">Contact</a>
         </li>
         <li>
           <a href="{{ url_for('root.abuse') }}">Abuse</a>
         </li>
         <li>
           {% if '.onion' in request.url_root %}
             <a href="//{{ config['ENNSTATUS_WIKI_ONION_ADDRESS'] }}">Wiki</a>
           {% elif '.bit' in request.url_root %}
             <a href="//{{ config['ENNSTATUS_WIKI_BIT_ADDRESS'] }}">Wiki</a>
           {% else %}
             <a href="//wiki.enn.lu">Wiki</a>
           {% endif %}
        </li>
         <li class="dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown">Servers <b class="caret"></b></a>
           <ul class="dropdown-menu">
             <li><a href="{{ url_for('status.index') }}">All nodes</a></li>
             <li><a href="{{ url_for('status.exit') }}">Exit nodes</a></li>
             <li><a href="{{ url_for('status.relay') }}">Relay nodes</a></li>
             <li><a href="{{ url_for('status.bridge') }}">Bridge nodes</a></li>
             <li class="divider"></li>
             <li><a href="{{ url_for('status.about') }}">Ënnstatus About</a></li>
             <li><a>Tor Servers</a></li>
             <li><a>Mirrors</a></li>
             <li><a>About Ennstatus</a></li>
           </ul>
         </li>
         <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown">Statistics <b class="caret"></b></a>
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown">Support <b class="caret"></b></a>
           <ul class="dropdown-menu">
             <li class="disabled"><a href="#">Statistics</a></li>
             <li class="divider"></li>
             <li class="dropdown-header">Worldmaps</li>
             <li><a href="{{ url_for('stats.worldmap') }}">All nodes</a></li>
             <li><a href="{{ url_for('stats.worldmap', server_type='exit') }}">Exit nodes</a></li>
             <li><a href="{{ url_for('stats.worldmap', server_type='relay') }}">Relay nodes</a></li>
             <li><a href="{{ url_for('stats.worldmap', server_type='bridge') }}">Bridge nodes</a></li>
             <li><a>Donate</a></li>
             <li><a>Become a member</a></li>
             <li><a>Special programs</a></li>
           </ul>
         </li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
         <li class="bg-success">
           <a href="{{ url_for('root.member') }}">Become a member</a>
         <li class="dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown">Contact <b class="caret"></b></a>
           <ul class="dropdown-menu">
             <li><a>General</a></li>
             <li><a>Abuse</a></li>
             <li><a>Press</a></li>
           </ul>
         </li>
       </ul>
     </div>
   </div>
   {% endblock %}
   <div class="row" id="content">
   {% with messages = get_flashed_messages(with_categories=True) %}
     {% if messages %}
       <div class="col-md-12">
         {% for category, message in messages %}
           {{ base_macros.display_error(category, message) }}
         {% endfor %}

0 comments (0 inline, 0 general)