Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: getnikola/nikola-users
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1e0ddb357529
Choose a base ref
...
head repository: getnikola/nikola-users
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8e676ca13c2e
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Jul 2, 2015

  1. add new relic 

    Signed-off-by: Chris Warrick <kwpolska@gmail.com>
    @Kwpolska
    Kwpolska committed Jul 2, 2015
    Copy the full SHA
    c77e3c1 View commit details

  2. getnikola/nikola@94ff975 

    Signed-off-by: Chris Warrick <kwpolska@gmail.com>
    @Kwpolska
    Kwpolska committed Jul 2, 2015
    Copy the full SHA
    0a2fb84 View commit details

  3. use one navbar with dropdowns 

    Signed-off-by: Chris Warrick <kwpolska@gmail.com>
    @Kwpolska
    Kwpolska committed Jul 2, 2015
    Copy the full SHA
    8e676ca View commit details
Showing with 22 additions and 39 deletions.
  1. +7 −3 app.py
  2. +15 −36 templates/base.html
10 changes: 7 additions & 3 deletions app.py
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-


import newrelic.agent
newrelic.agent.initialize('/srv/nikola-users/newrelic.ini')

import os
import json
import urlparse
import datetime
import random
import mandrill
import newrelic.agent
import requests
from flask import Flask, render_template, request, abort, flash, session, url_for, redirect, escape
from flask import Flask, render_template, request, abort, session, url_for, redirect, escape
from flask.ext.sqlalchemy import SQLAlchemy
from sqlalchemy import exc as sqlexc
from sqlalchemy.dialects.postgresql import ARRAY
@@ -165,7 +168,8 @@ def checkgenerator(f):
try:
r = requests.get(rssurl)
nsite = False
patterns = ['<generator>http://getnikola.com/</generator>', # v7.0.0
patterns = ['<generator>https://getnikola.com/</generator>', # v7.6.1
'<generator>http://getnikola.com/</generator>', # v7.0.0
'<generator>Nikola <http://getnikola.com/></generator>', # v6.3.0
'<generator>nikola</generator>'] # v6.2.1
for i in patterns:
51 changes: 15 additions & 36 deletions templates/base.html
View file
Original file line number Diff line number Diff line change
@@ -59,9 +59,6 @@
border: 1px #aa8 solid;
}
*/
.navbar-nusers {
top: 50px;
}

body {
margin-top: 110px;
@@ -149,8 +146,21 @@
<li>
<a href="https://plugins.getnikola.com">Plugins</a>
</li>
<li class="active">
<a href="https://users.getnikola.com">Users<span class="sr-only"> (active)</span></a>
<li class="dropdown active">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Users <b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/add/">Add</a></li>
<li><a href="/edit/">Edit</a></li>
<li><a href="/remove/">Remove</a></li>
<li role="separator" class="divider"></li>
<li><a href="/check/">Check sites</a></li>
{% if session.get('email') %}
<li><a href="/acp/"><b>Manage</b></a></a></li>
<li><a href="#" id="signout">Sign out [{{ session.email}}]</a></li>
{% else %}
<li><a href="#" id="signin">Sign in (admins only)</a></li>
{% endif %}
</ul>
</li>
<li>
<a href="https://getnikola.com/blog/index.html">Blog</a>
@@ -162,37 +172,6 @@
</div>
</div>
</nav>

<nav class="navbar navbar-fixed-top navbar-default navbar-nusers" role="navigation">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-nusers-collapse">
<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="/"><span id="blog-title">Some Sites Using Nikola</span></a>
</div>
<div class="collapse navbar-collapse navbar-nusers-collapse">
<ul class="nav navbar-nav">
</li><li><a href="/add/">Add</a>
</li><li><a href="/edit/">Edit</a>
</li><li><a href="/remove/">Remove</a>
</li></ul>

<ul class="nav navbar-nav navbar-right">
<li><a href="/check/">Check sites</a></li>
{% if session.get('email') %}
<li><a href="/acp/"><b>Manage</b></a></a></li>
<li><a href="#" id="signout">Sign out [{{ session.email}}]</a></li>
{% else %}
<li><a href="#" id="signin">Sign in (admins only)</a></li>
{% endif %}
</ul>
</div>
</div>
</nav>
<!-- End of Menubar -->