Skip to content

Commit

Permalink
refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
ralphite committed Sep 22, 2017
1 parent de9059f commit e1f7667
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
6 changes: 3 additions & 3 deletions bootcamp/core/templates/core/profile.html
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@ <h1>{{ page_user.profile.get_screen_name }} {% if page_user.get_full_name %}<sma
<img src="{{ page_user.profile.get_picture }}" class="picture">
<ul>
{% if page_user.profile.job_title %}
<li><span class="glyphicon glyphicon-briefcase"></span> {{ page_user.profile.job_title }}</li>
<li><span class="glyphicon glyphicon-briefcase"></span> {{ page_user.profile.job_title }}</li>
{% endif %}
{% if page_user.profile.location %}
<li><span class="glyphicon glyphicon-map-marker"></span> {{ page_user.profile.location }}</li>
<li><span class="glyphicon glyphicon-map-marker"></span> {{ page_user.profile.location }}</li>
{% endif %}
{% if page_user.profile.url %}
<li><span class="glyphicon glyphicon-globe"></span> <a href="{{ page_user.profile.get_url }}" target="_blank">{{ page_user.profile.get_url }}</a></li>
<li><span class="glyphicon glyphicon-globe"></span> <a href="{{ page_user.profile.get_url }}" target="_blank">{{ page_user.profile.get_url }}</a></li>
{% endif %}
</ul>
</div>
Expand Down
7 changes: 3 additions & 4 deletions bootcamp/core/views.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
import os
import json

from django.shortcuts import get_object_or_404
from PIL import Image

from django.conf import settings as django_settings
from django.contrib import messages
from django.db.models import Q
from django.contrib.auth import update_session_auth_hash
from django.contrib.auth.decorators import login_required
from django.contrib.auth.models import User
from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
from django.shortcuts import redirect, render
from django.shortcuts import get_object_or_404, redirect, render

from bootcamp.core.forms import ChangePasswordForm, ProfileForm
from bootcamp.feeds.views import FEEDS_NUM_PAGES, feeds
Expand All @@ -19,8 +20,6 @@
from bootcamp.activities.models import Activity
from bootcamp.messenger.models import Message

from PIL import Image


def home(request):
if request.user.is_authenticated():
Expand Down
2 changes: 1 addition & 1 deletion bootcamp/feeds/static/js/feeds.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ $(function () {
$(".stream-update").hide();
$(".stream-update .new-posts").text("");
$(document).attr("title", page_title);
};
}

$("body").keydown(function (evt) {
var keyCode = evt.which?evt.which:evt.keyCode;
Expand Down

0 comments on commit e1f7667

Please sign in to comment.