fergalmoran/dss
1
0
Fork 0
mirror of https://github.com/fergalmoran/dss.git synced 2026-01-03 23:44:02 +00:00
Code Issues 13 Packages Projects Releases Wiki Activity

Updated font awesome to 4.1

Browse Source
This commit is contained in:
Fergal Moran
2014-02-08 23:43:30 +00:00
parent a3044e699b
commit 80f50cd39a
28 changed files with 335 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spa/views.py
View File

@@ -27,11 +27,11 @@ def app(request):
'bust': uuid.uuid1()
}
if request.user_agent.browser.family != 'aaaFirefox':
if request.user_agent.browser.family == 'Firefox':
context['ua_html'] = \
"""<div class="alert alert-block alert-warning">
<button type="button" class="close" data-dismiss="alert">
<i class="icon-remove"></i>
<i class="fa fa-close"></i>
</button>
<i class="fa fa-eye"></i>
<strong>Hello Firefox user.</strong> If you are having any problems with the site, please do a

416
static/css/ace/uncompressed/ace.css
View File

File diff suppressed because it is too large Load Diff

8
static/css/dss.main.css
View File

@@ -796,4 +796,10 @@ img.mix-listing-image {
.dss-player-wrapper{
margin-top: 4px;
}
}
[class^="fa-"] {
display: inline-block;
text-align: center;
}

1
templates/base.html
View File

@@ -6,6 +6,7 @@
{% load compress %}
{% load static %}
<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Open+Sans:400,300"/>
<link href='http://fonts.googleapis.com/css?family=Merriweather' rel='stylesheet' type='text/css'>
{% compress css %}
<link rel="stylesheet" href="{% static "css/dss.overrides.css" %}">
<link rel="stylesheet" href="{% static "css/bootstrap.css" %}"/>

12
templates/inc/bitsnbobs/moodymanc.html
View File

@@ -87,27 +87,27 @@
<div class="widget-main">
<ul class="list-unstyled spaced2">
<li>
<i class="icon-headphones green"></i>
<i class="fa fa-headphones green"></i>
<a target="_blank" href="http://soundcloud.com/moodymanc">Moodymanc</a>
</li>
<li>
<i class="icon-headphones green"></i>
<i class="fa fa-headphones green"></i>
<a target="_blank" href="http://deepsouthsounds.com/user/fergalmoran">Fergal Moran</a>
</li>
<li>
<i class="icon-headphones green"></i>
<i class="fa fa-headphones green"></i>
<a target="_blank" href="http://deepsouthsounds.com/user/deepsouth">Edwin Dunlea</a>
</li>
<li>
<i class="icon-headphones green"></i>
<i class="fa fa-headphones green"></i>
<a target="_blank" href="http://deepsouthsounds.com/user/adamdunbar">Adam Dunbar</a>
</li>
<li>
<i class="icon-headphones green"></i>
<i class="fa fa-headphones green"></i>
<a target="_blank" href="http://deepsouthsounds.com/user/muraku">Muraku</a>
</li>
<li>
<i class="icon-headphones green"></i>
<i class="fa fa-headphones green"></i>
<a target="_blank" href="http://deepsouthsounds.com/user/jamiethedeep">Jamie O'
Sullivan</a>
</li>

4
templates/views/ActivityListItemView.html
View File

@@ -5,7 +5,7 @@
<div class="body">
<div class="time">
<i class="icon-time"></i>
<i class="fa fa-time"></i>
<span class="green"><%= human_date %></span>
</div>
@@ -18,7 +18,7 @@
<div class="tools">
<a href="#" class="btn btn-xser btn-info">
<i class="icon-only icon-share-alt"></i>
<i class="fa fa-only fa fa-share-alt"></i>
</a>
</div>
</div>

2
templates/views/ActivityListView.html
View File

@@ -1,6 +1,6 @@
<div class="widget-header">
<h4 class="lighter smaller">
<i class="icon-comment blue"></i>
<i class="fa fa-comment blue"></i>
Activity
</h4>
</div>

4
templates/views/CommentItemView.html
View File

@@ -6,7 +6,7 @@
<div class="body">
<div class="time">
<i class="icon-time"></i>
<i class="fa fa-time"></i>
<span class="green"><%= humanise(date_created) %></span>
</div>
@@ -18,7 +18,7 @@
<% if (can_edit) { %>
<div class="tools">
<a id="delete-comment" class="btn btn-minier btn-danger">
<i class="icon-only icon-trash"></i>
<i class="fa fa-only fa fa-trash"></i>
</a>
</div>
<% } %>

2
templates/views/CommentListView.html
View File

@@ -1,7 +1,7 @@
<div class="widget-box ">
<div class="widget-header">
<h4 class="lighter smaller">
<i class="icon-comment blue"></i>
<i class="fa fa-comment blue"></i>
</h4>
</div>

2
templates/views/EventItemView.html
View File

@@ -1,7 +1,7 @@
<div class="hero-unit">
<div class="row">
<div id="event-header" class="bordered">
<h3><i class="icon-time"></i>
<h3><i class="fa fa-time"></i>
<%= item.event_date %>
&nbsp;-&nbsp;
<%= item.venue %>

24
templates/views/HeaderView.html
View File

@@ -9,22 +9,22 @@
</div>
<div class="navbar-header">
<ul class="nav ace-nav">
<li><a href="/mixes"><i class="icon-music icon-white"></i>Mixes</a></li>
<li><a href="/users"><i class="icon-user icon-white"></i>Users</a></li>
<li><a href="/mixes"><i class="fa fa-music fa fa-white"></i>Mixes</a></li>
<li><a href="/users"><i class="fa fa-user fa fa-white"></i>Users</a></li>
{% if user.is_authenticated %}
<li><a href="/stream" title="Show mixes from people you follow" id="header-stream-button"><i class="icon-circle-arrow-down icon-white"></i>Stream</a></li>
<li><a href="/stream" title="Show mixes from people you follow" id="header-stream-button"><i class="fa fa-circle-arrow-down fa fa-white"></i>Stream</a></li>
{% endif %}
<li><a data-bypass="true" title="Show random mix from our vaults" id="header-random-button"><i class="icon-cogs icon-white"></i>Random</a></li>
<li><a data-bypass="true" target="_blank" href="/podcast"><i class="icon-rss icon-white"></i>Podcast</a></li>
<li><a data-bypass="true" title="Show random mix from our vaults" id="header-random-button"><i class="fa fa-cogs fa fa-white"></i>Random</a></li>
<li><a data-bypass="true" target="_blank" href="/podcast"><i class="fa fa-rss fa fa-white"></i>Podcast</a></li>
<li class="purple">
<a data-bypass="true" id="header-live-button">&nbsp;Listen Live
<i class="icon-headphones icon-white" id="header-live-icon"></i>
<i class="fa fa-headphones fa fa-white" id="header-live-icon"></i>
</a>
</li>
{% if user.is_authenticated %}
<li class="purple">
<a href="/mix/upload" id='upload'>Upload
<i class="icon-hand-up icon-white"></i>
<i class="fa fa-hand-up fa fa-white"></i>
</a>
</li>
{% endif %}
@@ -32,7 +32,7 @@
</div>
<div class="navbar-header pull-right" role="navigation">
<ul class="nav ace-nav">
<li><a class="btn-danger" data-bypass="true" id="header-donate-button"><i class="icon-euro" />Donate</a></li>
<li><a class="btn-danger" data-bypass="true" id="header-donate-button"><i class="fa fa-euro" />Donate</a></li>
<li class="nav ace-nav" id="header-notifications">
<!-- End Notifications li -->
</li>
@@ -48,18 +48,18 @@
<small>Welcome,</small>
{{ user.first_name }}
</span>
<i class="icon-caret-down"></i>
<i class="fa fa-caret-down"></i>
</a>
<ul class="user-menu pull-right dropdown-menu dropdown-yellow dropdown-caret dropdown-closer">
<li>
<a href="/me">
<i class="icon-cog"></i>
<i class="fa fa-cog"></i>
Settings
</a>
</li>
<li>
<a href="{{ user|profile_url }}">
<i class="icon-user"></i>
<i class="fa fa-user"></i>
Profile
</a>
</li>
@@ -71,7 +71,7 @@
</form>
<a data-bypass="true" id="header-logout-button"
onclick="document.getElementById('logout-form').submit();">
<i class="icon-off"></i>
<i class="fa fa-off"></i>
Logout
</a>
<input type="hidden" name="user_id" value="{{ user.id }}"/>

6
templates/views/MixDetailView.html
View File

@@ -10,7 +10,7 @@
<button class="btn btn-sm btn-default"
id="btn-add-comment"
type="button">
<i class="icon-comment bigger-110"></i>
<i class="fa fa-comment bigger-110"></i>
Add comment!
</button>
</span>
@@ -23,13 +23,13 @@
<ul id="mix-tab" class="nav nav-tabs" data-tabs="tabs">
<li class="active" id="tab-description">
<a data-bypass="true" href="#description" data-toggle="tab">
<i class="orange icon-terminal bigger-120"></i>
<i class="orange fa fa-terminal bigger-120"></i>
Description
</a>
</li>
<li id="tab-comments">
<a data-bypass="true" href="#comments" data-toggle="tab">
<i class="orange icon-comments bigger-120"></i>
<i class="orange fa fa-comments bigger-120"></i>
Comments
<span class="badge badge-danger"><%= comments.length %></span>
</a>

8
templates/views/MixEditView.html
View File

@@ -4,7 +4,7 @@
<h1>
New Mix
<small>
<i class="icon-double-angle-right"></i>
<i class="fa fa-double-angle-right"></i>
You know what to do - keep it clean!
</small>
</h1>
@@ -61,19 +61,19 @@
<div class="row-fluid wizard-actions">
<div class="alert alert-danger pull-left" id="mix-upload-error" style="display:none;">
<strong>
<i class="icon-remove"></i>
<i class="fa fa-remove"></i>
Please add some audio!
</strong>
Drag & drop an mp3 above or click the image to browse
<br>
</div>
<button class="btn btn-prev">
<i class="icon-arrow-left"></i>
<i class="fa fa-arrow-left"></i>
Prev
</button>
<button class="btn btn-success btn-next" data-last="Finish ">
Next
<i class="icon-arrow-right icon-on-right"></i>
<i class="fa fa-arrow-right fa fa-on-right"></i>
</button>
</div>
</div>

28
templates/views/MixItemView.html
View File

@@ -7,7 +7,7 @@
<div class="mix-profile-insert">
<h6>
<a href="/<%= user_profile_url %>" id="<%= id %>">
<i class="icon-user"></i>&nbsp;<%= user_name %>
<i class="fa fa-user"></i>&nbsp;<%= user_name %>
</a>
</h6>
</div>
@@ -15,8 +15,8 @@
<div class="footer-button">
<div class="btn-group">
<button class="btn btn-info btn-xs dropdown-toggle" data-toggle="dropdown">
<i class="icon-share"></i>Share
<span class="icon-caret-down icon-on-right"></span>
<i class="fa fa-share"></i>Share
<span class="fa fa-caret-down fa fa-on-right"></span>
</button>
<ul class="dropdown-menu">
<li>
@@ -79,7 +79,7 @@
<div class="player-footer">
<div class="play-button footer-button">
<a id="play-button-<%= id %>" class="mix-state-toggle play blue" data-bypass="true" style="">
<i id="play-state-icon-<%= id %>" class="icon-play bigger-180"></i>
<i id="play-state-fa fa-<%= id %>" class="fa fa-play bigger-180"></i>
</a>
</div>
{% if user.is_authenticated %}
@@ -87,36 +87,36 @@
<a class="btn <% if (liked) { %>btn-pink<% } else { %>btn-light<% } %> btn-xs"
id="like-<%= id %>"
data-id="<%= id %>">
<i class="icon-heart"></i> Like<% if (liked) { %>d<% } %></a>
<i class="fa fa-heart"></i> Like<% if (liked) { %>d<% } %></a>
</div>
<div class="favourite-button footer-button">
<a class="btn <% if (favourited) { %>btn-pink<% } else { %>btn-light<% } %> btn-xs"
id="favourite-<%= id %>"
data-id="<%= id %>"><i class="icon-star-empty"></i> Favourite<% if (favourited) { %>d<% } %></a>
data-id="<%= id %>"><i class="fa fa-star-empty"></i> Favourite<% if (favourited) { %>d<% } %></a>
</div>
{% endif %}
<div class="footer-button">
<ul class="list-nostyle list-horiz">
<li title="<%= play_count %> Plays" class="stats-item bordered-right">
<span class="icon-play-circle tooltip-success" data-rel="tooltip" data-placement="right"
<span class="fa fa-play-circle tooltip-success" data-rel="tooltip" data-placement="right"
title="" data-original-title="<%= play_count %> Plays">
<%= play_count %>
</span>
</li>
<li title="<%= download_count %> Downloads" class="stats-item bordered-right">
<span class="icon-download-alt tooltip-success" data-rel="tooltip" data-placement="right"
<span class="fa fa-download-alt tooltip-success" data-rel="tooltip" data-placement="right"
title="" data-original-title="<%= download_count %> Downloads">
<%= download_count %>
</span>
</li>
<li title="<%= comment_count %> Comments" class="stats-item bordered-right">
<span class="icon-comment tooltip-success" data-rel="tooltip" data-placement="right"
<span class="fa fa-comment tooltip-success" data-rel="tooltip" data-placement="right"
title="" data-original-title="<%= comment_count %> Comments">
<%= comment_count %>
</span>
</li>
<li title="<%= like_count %> Likes" class="stats-item bordered-right">
<span class="icon-heart tooltip-success" data-rel="tooltip" data-placement="right" title=""
<span class="fa fa-heart tooltip-success" data-rel="tooltip" data-placement="right" title=""
data-original-title="<%= like_count %> Likes">
<%= like_count %>
</span>
@@ -126,23 +126,23 @@
<% if(can_edit) { %>
<div class="edit-button footer-button-right">
<a href="/mix/edit/<%= slug %>" class="btn btn-xs"
data-id="<%= id %>"><i class="icon-edit"></i>Edit</a>
data-id="<%= id %>"><i class="fa fa-edit"></i>Edit</a>
</div>
<div class="delete-button footer-button-right">
<a data-bypass="true" class="btn btn-xs btn-danger"
data-id="<%= id %>"><i class="icon-trash"></i>Delete</a>
data-id="<%= id %>"><i class="fa fa-trash"></i>Delete</a>
</div>
<% } %>
<% if (download_allowed) { %>
{% if user.is_authenticated %}
<div class="download-button footer-button-right">
<a class="btn btn-xs btn-success" data-id="<%= id %>">
<i class="icon-download"></i> Download</a>
<i class="fa fa-download"></i> Download</a>
</div>
{% else %}
<div class="login-download-button footer-button-right">
<a class="btn btn-xs btn-warning" data-id="<%= id %>">
<i class="icon-download"></i> Login to download</a>
<i class="fa fa-download"></i> Login to download</a>
</div>
{% endif %}
<% } %>

2
templates/views/NotificationsItemView.html
View File

@@ -6,7 +6,7 @@
<%= verb %> <%= target %>
</span>
<span class="msg-time">
<i class="icon-time"></i>
<i class="fa fa-time"></i>
<span>a moment ago</span>
</span>
</span>

4
templates/views/NotificationsListView.html
View File

@@ -1,11 +1,11 @@
<a data-toggle="dropdown" data-bypass="true" class="dropdown-toggle" href="#" id="notifications-dropdown">
<i id="notification-icon" class="icon-bell-alt"></i>
<i id="notification-icon" class="fa fa-bell-alt"></i>
<span class="badge badge-important" id="notification-count-badge"></span>
</a>
<ul class="pull-right dropdown-navbar dropdown-menu dropdown-caret dropdown-close" id="notif_list_node">
<li class="dropdown-header" >
<i class="icon-warning-sign"></i>
<i class="fa fa-warning-sign"></i>
<span id="notification-count"></span>
</li>
</ul>

8
templates/views/NowPlayingView.html
View File

@@ -1,6 +1,6 @@
<div class="widget-header widget-header-flat widget-header-small">
<h5>
<i class="icon-music"></i>
<i class="fa fa-music"></i>
Now Playing
</h5>
</div>
@@ -12,7 +12,7 @@
<a class="user" href="<%= item_url %>" title="<%= title %>"><%= title %></a>
<div class="time">
<i class="icon-user bigger-110"></i>
<i class="fa fa-user bigger-110"></i>
<a href="/<%= user_profile_url %>">
<%= user_name %>
</a>
@@ -25,10 +25,10 @@
{% endcomment %}
<div class="now-playing-tools action-buttons">
<a id="now-playing-play" href="#" class="blue" data-bypass="true">
<i class="icon-play bigger-125"></i>
<i class="fa fa-play bigger-125"></i>
</a>
<a id="now-playing-pause" href="#" class="red" data-bypass="true">
<i class="icon-pause bigger-125"></i>
<i class="fa fa-pause bigger-125"></i>
</a>
</div>
</div>

2
templates/views/ReleaseItemView.html
View File

@@ -8,7 +8,7 @@
{% if user.is_staff %}
<div class="edit-button footer-button-right">
<a href="/release/edit/<%= item.id %>" class="btn" data-mode="release" data-id="<%= item.id %>"><i
class="icon-edit"></i>Edit</a>
class="fa fa-edit"></i>Edit</a>
</div>
{% endif %}
</h3>

2
templates/views/SearchView.html
View File

@@ -1,4 +1,4 @@
<form class="navbar-search">
<input id="search-text" type="text" class="search-query span3" placeholder="Search">
<div class="icon-search"></div>
<div class="fa fa-search"></div>
</form>

1
templates/views/SidebarView.html
View File

@@ -1,4 +1,3 @@
<div class="widget-box" id="sidebar-now-playing"></div>
<br>
<div id="sidebar-stream-content"></div>

2
templates/views/SidebarViewUser.html
View File

@@ -10,7 +10,7 @@
<button href="#"
id="follow-button"
class="btn btn-xs">
<i id="follow-icon" class="icon-eye-close"></i>Following
<i id="follow-icon" class="fa fa-eye-close"></i>Following
</button>
</p>
</li>

2
templates/views/UserEditView.html
View File

@@ -54,7 +54,7 @@
</div>
</div>
<p id="custom_avatar_helptext" class="text-warning bigger-110 orange">
<i class="icon-warning-sign"></i>
<i class="fa fa-warning-sign"></i>
Choose your custom image in your Profile Page
</p>
</div>

30
templates/views/UserListItemView.html
View File

@@ -1,30 +1,30 @@
<div class="col-sm-12">
<h3 class="header blue smaller">
<i class="icon-user"></i>
<i class="fa fa-user"></i>
<a href="/user/<%= slug %>"><%= display_name %></a>
<span class="pull-right">
<a class="btn btn-xs btn-success" href="/user/<%= slug %>/mixes">
<i class="icon-music"></i>
<i class="fa fa-music"></i>
Mixes
<span class="badge badge-purple"><%= mix_count%></span>
</a>
<a class="btn btn-xs btn-success" href="/user/<%= slug %>/favourites">
<i class="icon-star"></i>
<i class="fa fa-star"></i>
Favourites
<span class="badge badge-purple"><%= favourite_count %></span>
</a>
<a class="btn btn-xs btn-success" href="/user/<%= slug %>/likes">
<i class="icon-heart"></i>
<i class="fa fa-heart"></i>
Likes
<span class="badge badge-purple"><%= like_count %></span>
</a>
<a class="btn btn-xs btn-success" href="/user/<%= slug %>/followers">
<i class="icon-check"></i>
<i class="fa fa-check"></i>
Followers
<span class="badge badge-purple"><%= followers.length %></span>
</a>
<a class="btn btn-xs btn-success" href="/user/<%= slug %>/following">
<i class="icon-share"></i>
<i class="fa fa-share"></i>
Following
<span class="badge badge-purple"><%= following.length %></span>
</a>
@@ -41,7 +41,7 @@
<div class="inline position-relative">
<% if (isMe(id)) { %>
<a href="#" data-bypass="true" class="user-title-label dropdown-toggle" data-toggle="dropdown">
<i class="icon-circle light-green middle"></i>
<i class="fa fa-circle light-green middle"></i>
&nbsp;
<span class="white"><%= display_name %></span>
</a>
@@ -49,21 +49,21 @@
<li class="dropdown-header"> Change Status</li>
<li>
<a href="#" data-bypass="true">
<i class="icon-circle green"></i>
<i class="fa fa-circle green"></i>
&nbsp;
<span class="green">Available</span>
</a>
</li>
<li>
<a href="#" data-bypass="true">
<i class="icon-circle red"></i>
<i class="fa fa-circle red"></i>
&nbsp;
<span class="red">Busy</span>
</a>
</li>
<li>
<a href="#" data-bypass="true">
<i class="icon-circle grey"></i>
<i class="fa fa-circle grey"></i>
&nbsp;
<span class="grey">Invisible</span>
</a>
@@ -71,7 +71,7 @@
</ul>
<% } else { %>
<p class="user-title-label dropdown-toggle">
<i class="icon-circle light-green middle"></i>
<i class="fa fa-circle light-green middle"></i>
&nbsp;
<span class="white"><%= display_name %></span>
</p>
@@ -89,18 +89,18 @@
</div>
<div class="col-sm-9 pull-right">
<div class="pull-right">
<i class="icon-calendar"></i>&nbsp;<span class="text-primary">Joined:</span><span class="text-muted">&nbsp;<%= humanise(date_joined) %></span>
<i class="icon-calendar"></i>&nbsp;<span class="text-primary">Last Seen:</span><span class="text-muted">&nbsp;<%= humanise(last_login) %></span>
<i class="fa fa-calendar"></i>&nbsp;<span class="text-primary">Joined:</span><span class="text-muted">&nbsp;<%= humanise(date_joined) %></span>
<i class="fa fa-calendar"></i>&nbsp;<span class="text-primary">Last Seen:</span><span class="text-muted">&nbsp;<%= humanise(last_login) %></span>
</div>
{% if user.is_authenticated %}
<button id="follow-button" class="btn btn-xs <%= is_following ? 'btn-success' : 'btn-danger' %>">
<i class="<%= is_following ? 'icon-ok' : 'icon-eye-open' %>"></i>
<i class="<%= is_following ? 'fa fa-ok' : 'fa fa-eye-open' %>"></i>
<%= is_following == true ? 'Following' : 'Follow' %>
</button>
{% else %}
<button id="follow-button-login"
class="follow-button btn btn-xs btn-danger icon">
<i id="follow-icon" class="icon-eye-close"></i>Login to Follow
<i id="follow-icon" class="fa fa-eye-close"></i>Login to Follow
</button>
{% endif %}
</div>

18
templates/views/UserListItemViewFancy.html
View File

@@ -6,13 +6,13 @@
<button href="#"
id="follow-button"
class="follow-button btn btn-xs btn-primary icon <% if (is_following) { %> disabled <% } %>">
<i id="follow-icon" class="icon-eye-close"></i>Follow
<i id="follow-icon" class="fa fa-eye-close"></i>Follow
</button>
{% else %}
<button href="#"
id="follow-button-login"
class="follow-button btn btn-xs btn-primary icon <% if (is_following) { %> disabled <% } %>">
<i id="follow-icon" class="icon-eye-close"></i>Follow
<i id="follow-icon" class="fa fa-eye-close"></i>Follow
</button>
{% endif %}
</li>
@@ -39,16 +39,16 @@
<p></p>
<p>
| <i class="icon-calendar"></i> Joined: <%= humanise(date_joined) %>
| <i class="icon-calendar"></i> Last Seen: <%= humanise(last_login) %>
| <i class="fa fa-calendar"></i> Joined: <%= humanise(date_joined) %>
| <i class="fa fa-calendar"></i> Last Seen: <%= humanise(last_login) %>
</p>
<p>
| <i class="icon-music"></i> <a href="/user/<%= slug %>"><%= mix_count%> Mixes</a>
| <i class="icon-heart"></i> <a href="/user/<%= slug %>/favourites"><%= favourite_count %> Favourites</a>
| <i class="icon-star-empty"></i> <a href="/user/<%= slug %>/likes"><%= like_count %> Likes</a>
| <i class="icon-check"></i> <a href="/user/<%= slug %>/followers"><%= followers.length %> Followers</a>
| <i class="icon-share"></i> <a href="/user/<%= slug %>/following"><%= following.length %> Following</a>
| <i class="fa fa-music"></i> <a href="/user/<%= slug %>"><%= mix_count%> Mixes</a>
| <i class="fa fa-heart"></i> <a href="/user/<%= slug %>/favourites"><%= favourite_count %> Favourites</a>
| <i class="fa fa-star-empty"></i> <a href="/user/<%= slug %>/likes"><%= like_count %> Likes</a>
| <i class="fa fa-check"></i> <a href="/user/<%= slug %>/followers"><%= followers.length %> Followers</a>
| <i class="fa fa-share"></i> <a href="/user/<%= slug %>/following"><%= following.length %> Following</a>
</p>
</div>
</div>

2
templates/views/UserListView.html
View File

@@ -3,7 +3,7 @@
<span class="input-icon">
<input id="search-text" type="text" placeholder="Search ..."
class="nav-search-input col-sm-12" id="nav-search-input" autocomplete="off">
<i class="icon-search nav-search-icon"></i>
<i class="fa fa-search nav-search-icon"></i>
</span>
</form>
</div>

34
templates/views/UserProfileView.html
View File

@@ -15,7 +15,7 @@
<div class="width-80 label label-info label-xlg arrowed-in arrowed-in-right">
<div class="inline position-relative">
<a href="#" class="user-title-label dropdown-toggle" data-toggle="dropdown">
<i class="icon-circle light-green middle"></i>
<i class="fa fa-circle light-green middle"></i>
&nbsp;
<span class="white"><%= display_name %></span>
</a>
@@ -23,21 +23,21 @@
<li class="dropdown-header"> Change Status</li>
<li>
<a href="#">
<i class="icon-circle green"></i>
<i class="fa fa-circle green"></i>
&nbsp;
<span class="green">Available</span>
</a>
</li>
<li>
<a href="#">
<i class="icon-circle red"></i>
<i class="fa fa-circle red"></i>
&nbsp;
<span class="red">Busy</span>
</a>
</li>
<li>
<a href="#">
<i class="icon-circle grey"></i>
<i class="fa fa-circle grey"></i>
&nbsp;
<span class="grey">Invisible</span>
</a>
@@ -51,12 +51,12 @@
<div class="profile-contact-links align-left">
{% if user.is_authenticated %}
<a id="follow-button" class="btn btn-link <% if (is_following) { %> following-disabled <% } %>" data-bypass="true">
<i class="icon-plus-sign bigger-120 <% if (is_following) { %>red<% } else { %>green <%}%>"></i>
<i class="fa fa-plus-sign bigger-120 <% if (is_following) { %>red<% } else { %>green <%}%>"></i>
<% if (is_following) { %>Unfollow<% } else { %>Follow<%}%>
</a>
{% else %}
<a id="follow-button-login" class="btn btn-link" data-bypass="true">
<i class="icon-plus-sign bigger-120 green"></i>
<i class="fa fa-plus-sign bigger-120 green"></i>
Login to follow
</a>
{% endif %}
@@ -64,12 +64,12 @@
<br>
{% comment %}
<a class="btn btn-link" href="#">
<i class="icon-envelope bigger-120 pink"></i>
<i class="fa fa-envelope bigger-120 pink"></i>
Send a message
</a>
{% endcomment %}
<a class="btn btn-link" href="<%= url %>">
<i class="icon-globe bigger-125 blue"></i>
<i class="fa fa-globe bigger-125 blue"></i>
Profile Link
</a>
</div>
@@ -77,15 +77,15 @@
{% comment %}
<div class="profile-social-links center">
<a href="#" class="tooltip-info" title="" data-original-title="Visit my Facebook">
<i class="middle icon-facebook-sign icon-2x blue"></i>
<i class="middle fa fa-facebook-sign fa fa-2x blue"></i>
</a>
<a href="#" class="tooltip-info" title="" data-original-title="Visit my Twitter">
<i class="middle icon-twitter-sign icon-2x light-blue"></i>
<i class="middle fa fa-twitter-sign fa fa-2x light-blue"></i>
</a>
<a href="#" class="tooltip-error" title="" data-original-title="Visit my Pinterest">
<i class="middle icon-pinterest-sign icon-2x red"></i>
<i class="middle fa fa-pinterest-sign fa fa-2x red"></i>
</a>
</div>
{% endcomment %}
@@ -95,27 +95,27 @@
<div class="col-xs-12 col-sm-9">
<div class="center">
<a href="/user/<%= slug %>/mixes" class="btn btn-app btn-sm btn-pink">
<i class="icon-music bigger-230"></i>
<i class="fa fa-music bigger-230"></i>
<span class="smaller-90">Mixes</span>
<span class="badge badge-warning"><%= mix_count%></span>
</a>
<a href="/user/<%= slug %>/favourites" class="btn btn-app btn-sm btn-danger">
<i class="icon-star bigger-230"></i>
<i class="fa fa-star bigger-230"></i>
<span class="smaller-90">Favourites</span>
<span class="badge badge-warning"><%= favourite_count %></span>
</a>
<a href="/user/<%= slug %>/likes" class="btn btn-app btn-sm btn-purple">
<i class="icon-heart /bigger-230"></i>
<i class="fa fa-heart /bigger-230"></i>
<span class="smaller-90">Likes</span>
<span class="badge badge-warning"><%= like_count %></span>
</a>
<a href="/user/<%= slug %>/followers" class="btn btn-app btn-sm btn-default">
<i class="icon-check bigger-230"></i>
<i class="fa fa-check bigger-230"></i>
<span class="smaller-90">Followers</span>
<span class="badge badge-warning"><%= followers.length %></span>
</a>
<a href="/user/<%= slug %>/following" class="btn btn-app btn-sm btn-warning">
<i class="icon-share bigger-230"></i>
<i class="fa fa-share bigger-230"></i>
<span class="smaller-90">Following</span>
<span class="badge badge-warning"><%= following.length %></span>
</a>
@@ -125,7 +125,7 @@
<div class="profile-info-row">
<div class="profile-info-name"> Location</div>
<div class="profile-info-value">
<i class="icon-map-marker light-orange bigger-110"></i>
<i class="fa fa-map-marker light-orange bigger-110"></i>
<span class="usereditable" id="city" style="display: inline;"><%= city %></span>
<span class="usereditable" id="country" style="display: inline;"><%= country %></span>
</div>

26
templates/views/_MixItemInsert.html
View File

@@ -7,7 +7,7 @@
<div class="mix-profile-insert">
<h6>
<a href="/<%= user_profile_url %>" id="<%= id %>">
<i class="icon-user"></i>&nbsp;<%= user_name %>
<i class="fa fa-user"></i>&nbsp;<%= user_name %>
</a>
</h6>
</div>
@@ -15,8 +15,8 @@
<div class="footer-button">
<div class="btn-group">
<button class="btn btn-info btn-xs dropdown-toggle" data-toggle="dropdown">
<i class="icon-share"></i>Share
<span class="icon-caret-down icon-on-right"></span>
<i class="fa fa-share"></i>Share
<span class="fa fa-caret-down fa fa-on-right"></span>
</button>
<ul class="dropdown-menu">
<li>
@@ -84,36 +84,36 @@
<div class="like-button footer-button">
<a class="btn <% if (liked) { %>btn-pink<% } else { %>btn-light<% } %> btn-xs" id="like-<%= id %>"
data-id="<%= id %>">
<i class="icon-heart"></i> Like<% if (liked) { %>d<% } %></a>
<i class="fa fa-heart"></i> Like<% if (liked) { %>d<% } %></a>
</div>
<div class="favourite-button footer-button">
<a class="btn <% if (favourited) { %>btn-pink<% } else { %>btn-light<% } %> btn-xs"
id="favourite-<%= id %>"
data-id="<%= id %>"><i class="icon-star-empty"></i> Favourite<% if (favourited) { %>d<% } %></a>
data-id="<%= id %>"><i class="fa fa-star-empty"></i> Favourite<% if (favourited) { %>d<% } %></a>
</div>
{% endif %}
<div class="footer-button">
<ul class="list-nostyle list-horiz">
<li title="<%= play_count %> Plays" class="stats-item bordered-right">
<span class="icon-play-circle tooltip-success" data-rel="tooltip" data-placement="right"
<span class="fa fa-play-circle tooltip-success" data-rel="tooltip" data-placement="right"
title="" data-original-title="<%= play_count %> Plays">
<%= play_count %>
</span>
</li>
<li title="<%= download_count %> Downloads" class="stats-item bordered-right">
<span class="icon-download-alt tooltip-success" data-rel="tooltip" data-placement="right"
<span class="fa fa-download-alt tooltip-success" data-rel="tooltip" data-placement="right"
title="" data-original-title="<%= download_count %> Downloads">
<%= download_count %>
</span>
</li>
<li title="<%= comment_count %> Comments" class="stats-item bordered-right">
<span class="icon-comment tooltip-success" data-rel="tooltip" data-placement="right"
<span class="fa fa-comment tooltip-success" data-rel="tooltip" data-placement="right"
title="" data-original-title="<%= comment_count %> Comments">
<%= comment_count %>
</span>
</li>
<li title="<%= like_count %> Likes" class="stats-item bordered-right">
<span class="icon-heart tooltip-success" data-rel="tooltip" data-placement="right" title=""
<span class="fa fa-heart tooltip-success" data-rel="tooltip" data-placement="right" title=""
data-original-title="<%= like_count %> Likes">
<%= like_count %>
</span>
@@ -123,23 +123,23 @@
<% if(can_edit) { %>
<div class="edit-button footer-button-right">
<a href="/mix/edit/<%= slug %>" class="btn btn-xs"
data-id="<%= id %>"><i class="icon-edit"></i>Edit</a>
data-id="<%= id %>"><i class="fa fa-edit"></i>Edit</a>
</div>
<div class="delete-button footer-button-right">
<a data-bypass="true" class="btn btn-xs btn-danger"
data-id="<%= id %>"><i class="icon-trash"></i>Delete</a>
data-id="<%= id %>"><i class="fa fa-trash"></i>Delete</a>
</div>
<% } %>
<% if (download_allowed) { %>
{% if user.is_authenticated %}
<div class="download-button footer-button-right">
<a class="btn btn-xs btn-success" data-id="<%= id %>">
<i class="icon-download"></i> Download</a>
<i class="fa fa-download"></i> Download</a>
</div>
{% else %}
<div class="login-download-button footer-button-right">
<a class="btn btn-xs btn-warning" data-id="<%= id %>">
<i class="icon-download"></i> Login to download</a>
<i class="fa fa-download"></i> Login to download</a>
</div>
{% endif %}
<% } %>

10
templates/views/dlg/Donate.html
View File

@@ -24,13 +24,13 @@
</div>
<div id="bitcoin-preamble" style="display: none">
<h3>Have 10 INTERNET nerd points!!</h3>
<i class="icon-smile yell"></i>&nbsp;You know what to do
<i class="fa fa-smile yell"></i>&nbsp;You know what to do
<hr />
<img src="{{ STATIC_URL }}img/bitcoin-qr.png" alt="Bitcoin QR wallet='1HwT3NxV7BpksNXBnm5hpG5EHAfRNZuJV2'">
<a class="btn btn-info" href="bitcoin:1HwT3NxV7BpksNXBnm5hpG5EHAfRNZuJV2">
<i class="icon-folder-open-alt bigger-125"></i>Open Wallet</a>
<i class="fa fa-folder-open-alt bigger-125"></i>Open Wallet</a>
<hr/>
<i class="icon-bitcoin green"></i>&nbsp;1HwT3NxV7BpksNXBnm5hpG5EHAfRNZuJV2
<i class="fa fa-bitcoin green"></i>&nbsp;1HwT3NxV7BpksNXBnm5hpG5EHAfRNZuJV2
</div>
</div>
<form id="paypal-form" action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
@@ -41,10 +41,10 @@
</form>
<p>
<button class="btn btn-pink" name="paypal" id="paypal-submit">
<i class="icon-euro bigger-125"></i>Paypal
<i class="fa fa-euro bigger-125"></i>Paypal
</button>
<button class="btn btn-info" name="bitcoins" id="bitcoins-submit">
<i class="icon-bitcoin align-top bigger-125"></i>Bitcoins
<i class="fa fa-bitcoin align-top bigger-125"></i>Bitcoins
</button>
</p>
{% endblock %}