More work on Account buildout.
parent
71671f3058
commit
d1fcb2834d
|
@ -8,31 +8,33 @@
|
||||||
<li><a href="/account/">Account</a></li>
|
<li><a href="/account/">Account</a></li>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block extra-scripts %}
|
||||||
|
<script type="text/javascript" charset="utf-8" src="https://ajax.googleapis.com/ajax/libs/angularjs/1.0.4/angular.min.js"></script>
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<section class="profile group">
|
<section class="profile group" ng-app="Account" ng-controller="MainController">
|
||||||
<aside>
|
<aside>
|
||||||
<ul class="nav nav-list">
|
<ul class="nav nav-list">
|
||||||
<li class="nav-header">Account</li>
|
<li class="nav-header">Account</li>
|
||||||
<li class="active">
|
<li ng-class="{active: route.current.scope.section == 'Profile'}">
|
||||||
<a href="">Profile</a>
|
<a href="/account/">Profile</a>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<a href="">Change Password</a>
|
<a href="/password/change/">Change Password</a>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li ng-class="{active: route.current.scope.section == 'Billing'}">
|
||||||
<a href="">Billing</a>
|
<a href="/account/billing/">Billing</a>
|
||||||
</li>
|
</li>
|
||||||
<li class="nav-header">Pro</li>
|
<li class="nav-header">Pro</li>
|
||||||
<li>
|
<li ng-class="{active: route.current.scope.section == 'Blogging'}">
|
||||||
<a href="">Blog settings</a>
|
<a href="/account/blogging/">Blog settings</a>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li ng-class="{active: route.current.scope.section == 'Editor'}">
|
||||||
<a href="">Editor settings</a>
|
<a href="/account/editor/">Editor settings</a>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</aside>
|
</aside>
|
||||||
<section class="content">
|
<section class="content" ng-view></section>
|
||||||
Content
|
|
||||||
</section>
|
|
||||||
</section>
|
</section>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
@ -3,6 +3,6 @@ from django.conf.urls.defaults import *
|
||||||
from accounts import views
|
from accounts import views
|
||||||
|
|
||||||
urlpatterns = patterns('',
|
urlpatterns = patterns('',
|
||||||
url(r'^$', views.account, name='account-detail'),
|
|
||||||
url(r'^stats/$', views.stats, name='account-stats'),
|
url(r'^stats/$', views.stats, name='account-stats'),
|
||||||
|
url(r'^', views.account, name='account-detail'),
|
||||||
)
|
)
|
||||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -92,6 +92,9 @@ body {
|
||||||
.hidden {
|
.hidden {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
[ng\:cloak], [ng-cloak], .ng-cloak {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
// Global
|
// Global
|
||||||
header.main {
|
header.main {
|
||||||
|
@ -1513,10 +1516,30 @@ body.account {
|
||||||
section.profile {
|
section.profile {
|
||||||
aside {
|
aside {
|
||||||
float: left;
|
float: left;
|
||||||
|
padding-top: 30px;
|
||||||
width: 190px;
|
width: 190px;
|
||||||
|
|
||||||
|
ul {
|
||||||
|
li {
|
||||||
|
a {
|
||||||
|
color: #43A8C6;
|
||||||
|
}
|
||||||
|
&.active {
|
||||||
|
a {
|
||||||
|
background: #43A8C6;
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
section.content {
|
section.content {
|
||||||
|
background: white;
|
||||||
|
border-bottom: 1px solid #DDDDDD;
|
||||||
|
border-left: 4px solid #43A8C6;
|
||||||
|
float: right;
|
||||||
|
min-height: 400px;
|
||||||
|
width: 555px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,6 +4,7 @@ cat media/js/src/application.js|jsmin > media/js/src/application.min.js
|
||||||
cat media/js/src/modules/site.js|jsmin > media/js/src/modules/site.min.js
|
cat media/js/src/modules/site.js|jsmin > media/js/src/modules/site.min.js
|
||||||
cat media/js/src/modules/snipt.js|jsmin > media/js/src/modules/snipt.min.js
|
cat media/js/src/modules/snipt.js|jsmin > media/js/src/modules/snipt.min.js
|
||||||
|
|
||||||
|
cat media/js/src/account.js|jsmin > media/js/src/account.min.js
|
||||||
cat media/js/src/pro.js|jsmin > media/js/src/pro.min.js
|
cat media/js/src/pro.js|jsmin > media/js/src/pro.min.js
|
||||||
|
|
||||||
cat media/js/libs/underscore.js \
|
cat media/js/libs/underscore.js \
|
||||||
|
@ -16,6 +17,7 @@ cat media/js/libs/underscore.js \
|
||||||
media/js/src/application.min.js \
|
media/js/src/application.min.js \
|
||||||
media/js/src/modules/site.min.js \
|
media/js/src/modules/site.min.js \
|
||||||
media/js/src/modules/snipt.min.js \
|
media/js/src/modules/snipt.min.js \
|
||||||
|
media/js/src/account.min.js \
|
||||||
media/js/libs/codemirror.js \
|
media/js/libs/codemirror.js \
|
||||||
media/js/libs/highlight.js \
|
media/js/libs/highlight.js \
|
||||||
> media/js/snipt.js
|
> media/js/snipt.js
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -121,7 +121,7 @@ class PrivateUserResource(ModelResource):
|
||||||
class Meta:
|
class Meta:
|
||||||
queryset = User.objects.all()
|
queryset = User.objects.all()
|
||||||
resource_name = 'user'
|
resource_name = 'user'
|
||||||
fields = ['id', 'username', 'email',]
|
fields = ['id', 'username', 'email']
|
||||||
include_absolute_url = True
|
include_absolute_url = True
|
||||||
allowed_methods = ['get']
|
allowed_methods = ['get']
|
||||||
list_allowed_methods = []
|
list_allowed_methods = []
|
||||||
|
|
|
@ -326,12 +326,11 @@
|
||||||
</div>
|
</div>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block extra-scripts %}{% endblock %}
|
||||||
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
|
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
|
||||||
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/jquery-ui.min.js"></script>
|
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/jquery-ui.min.js"></script>
|
||||||
<script type="text/javascript" src="{{ STATIC_URL }}js/snipt.js?43"></script>
|
<script type="text/javascript" src="{{ STATIC_URL }}js/snipt.js?43"></script>
|
||||||
|
|
||||||
{% block extra-scripts %}{% endblock %}
|
|
||||||
|
|
||||||
{% block inline-js %}
|
{% block inline-js %}
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
{% block js %}
|
{% block js %}
|
||||||
|
|
Loading…
Reference in New Issue