Skip to content

Commit

Permalink
small fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
ialbert committed Mar 1, 2014
1 parent bef270a commit c901552
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 17 deletions.
3 changes: 2 additions & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ Copyright (c) 2013 Istvan Albert and Biostar contributors.
Core developers
---------------
Istvan Albert
Pindi Albert


Contributors
------------
Pindi Albert
Alexandr Levchuck
Eric Normandeau
Egon Willingham
Expand Down
13 changes: 7 additions & 6 deletions biostar/apps/posts/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from django import forms
from django.core.urlresolvers import reverse
from crispy_forms.helper import FormHelper
from crispy_forms.layout import Layout, Field, Fieldset, Submit, ButtonHolder
from crispy_forms.layout import Layout, Field, Fieldset, Div, Submit, ButtonHolder
from django.shortcuts import render
from django.http import HttpResponseRedirect
from django.contrib import messages
Expand Down Expand Up @@ -46,13 +46,14 @@ class LongForm(forms.Form):
def __init__(self, *args, **kwargs):
super(LongForm, self).__init__(*args, **kwargs)
self.helper = FormHelper()
self.helper.form_class = "post-form"
self.helper.layout = Layout(
Fieldset(
'Post',
'title',
'post_type',
'tag_val',
'content',
'Post Form',
Field('title'),
Field('post_type'),
Field('tag_val'),
Field('content'),
),
ButtonHolder(
Submit('submit', 'Submit')
Expand Down
12 changes: 7 additions & 5 deletions biostar/server/context.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,18 @@ def get_recent_replies():
return posts

TRAFFIC_KEY = "traffic"
def get_traffic():
def get_traffic(minutes=60):
"Obtains the number of distinct IP numbers "
global TRAFFIC_KEY
traffic = cache.get(TRAFFIC_KEY)
if not traffic:
recent = const.now() - timedelta(minutes=minutes)
try:
recent = const.now() - timedelta(minutes=60)
traffic = PostView.objects.filter(date__gt=recent).distinct('ip').count()
except Exception, exc:
traffic = PostView.objects.filter(date__gt=recent).count()
cache.set(TRAFFIC_KEY, traffic, 300)
# How long to cache the traffic.
cache.set(TRAFFIC_KEY, traffic, CACHE_TIMEOUT)
return traffic

def shortcuts(request):
Expand All @@ -53,14 +55,14 @@ def shortcuts(request):
"GOOGLE_TRACKER": settings.GOOGLE_TRACKER,
"SITE_STYLE_CSS": settings.SITE_STYLE_CSS,
"SITE_LOGO": settings.SITE_LOGO,
"SITE_NAME": settings.SITE_NAME,
"CATEGORIES": settings.CATEGORIES,
"BIOSTAR_VERSION": VERSION,
"TRAFFIC": get_traffic(),
'RECENT_REPLIES': get_recent_replies(),
'RECENT_VOTES': get_recent_votes(),
'USE_COMPRESSOR': settings.USE_COMPRESSOR,
'COUNTS': request.session[settings.SESSION_KEY],
'SITE_NAME': settings.SITE_NAME,
'COUNTS': request.session.get(settings.SESSION_KEY, {}),
}

return context
2 changes: 1 addition & 1 deletion biostar/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -426,4 +426,4 @@ def abspath(*args):
EMAIL_HOST = get_env("EMAIL_HOST")
EMAIL_PORT = get_env("EMAIL_PORT", func=int)
EMAIL_HOST_USER = get_env("EMAIL_HOST_USER")
EMAIL_HOST_PASSWORD = get_env("EMAIL_HOST_PASSWORD")
EMAIL_HOST_PASSWORD = get_env("EMAIL_HOST_PASSWORD")
2 changes: 1 addition & 1 deletion biostar/static/biostar.base.less
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ div#navbar {
}

.userbox.grey {
background-color: #e1e1e1;
background-color: #efefef;
border: 1px solid #d3d3d3;
}

Expand Down
2 changes: 1 addition & 1 deletion biostar/static/biostar.js
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ $(document).ready(function () {

if (tagval.length > 0) {
tagval.removeClass("textinput textInput form-control")
tagval.width("100%")
tagval.width("96%")

var tag_list = $.ajax({
url: "/local/search/tags/",
Expand Down
1 change: 0 additions & 1 deletion conf/__init__.py

This file was deleted.

1 change: 0 additions & 1 deletion conf/server/__init__.py

This file was deleted.

0 comments on commit c901552

Please sign in to comment.