EbookFoundation
/
regluit
mirror of https://github.com/EbookFoundation/regluit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merging work.html changes

pull/1/head
Andromeda Yelton 2011-12-28 23:19:18 -05:00
parent 79bc9ac15a f9adbd0bc3
commit a742773799
13 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/fixtures/initial_data.json
View File

@ -7,6 +7,22 @@
"name": "unglue.it"
}
},
{
"pk": 2,
"model": "sites.site",
"fields": {
"domain": "please.unglueit.com",
"name": "unglue.it development"
}
},
{
"pk": 3,
"model": "sites.site",
"fields": {
"domain": "localhost:8000",
"name": "unglue.it local development"
}
},
{
"pk": 1,
"model": "core.premium",

2
frontend/templates/base.html
View File

@ -48,7 +48,7 @@
<li class="first"><a href="/supporter/{{user.username}}"><span id="welcome">Welcome, {{ user.username }}</span></a></li>
<li><a href="{% url auth_logout %}"><span>Sign Out</span></a></li>
{% else %}
<li class="first"><a href="{% url auth_login %}?next={% firstof request.path '/' %}"><span>Sign In</span></a></li>
<li class="first"><a href="{% url auth_login %}"><span>Sign In</span></a></li>
{% endif %}
<li><a href="/stub/tour"><span>Tour</span></a></li>
<li><a href="{{faqurl}}"><span>FAQs</span></a></li>

4
frontend/templates/basedocumentation.html
View File

@ -23,8 +23,8 @@
<div class="user-block2">
<div class="block-inner">
<label class="title">Spread the Word</label>
<a href="#"><img src="/static/images/icons/facebook.png" alt="Facebook" title="Facebook" /></a>
<a href="#"><img src="/static/images/icons/twitter.png" alt="Twitter" title="Twitter" /></a>
<a href="https://www.facebook.com/sharer.php?u={{request.build_absolute_uri}}{{ request.path|urlencode:"" }}"><img src="/static/images/icons/facebook.png" alt="Facebook" title="Facebook" /></a>
<a href="https://twitter.com/intent/tweet?url={{request.build_absolute_uri}}{{ request.path|urlencode:"" }}&text=Unglue%ebooks%21"><img src="/static/images/icons/twitter.png" alt="Twitter" title="Twitter" /></a>
<a href="#"><img src="/static/images/icons/email.png" alt="email" title="email" /></a>
</div>
</div>

6
frontend/templates/home.html
View File

@ -74,7 +74,7 @@ var $j = jQuery.noConflict();
<div class="user-block2">
<div class="block-inner">
<label class="title">Spread the Word</label>
<a href="https://www.facebook.com/sharer/sharer.php?src=bm&u=http://{{ request.META.HTTP_HOST }}{{ request.path }}"><img src="/static/images/supporter_icons/facebook_square.png" alt="Facebook" title="Facebook" /></a>
<a href="https://www.facebook.com/sharer/sharer.php?src=bm&u={{request.build_absolute_uri}}"><img src="/static/images/supporter_icons/facebook_square.png" alt="Facebook" title="Facebook" /></a>
<a href="https://twitter.com/share"><img src="/static/images/supporter_icons/twitter_square.png" alt="tweeter" title="Twitter" /></a>
</div>
</div>
@ -121,7 +121,7 @@ var $j = jQuery.noConflict();
</div>
</form>
<div class="google_signup">
<a href="/socialauth/login/google?next=http://{{ request.get_host }}{{ next }}"><img src="{{ STATIC_URL }}images/auth/google_32_noborder.png"></a><div>Or: <a href="/socialauth/login/google?next=http://{{ request.get_host }}{{ next }}">Sign Up With Google</a></div>
<a href="/socialauth/login/google?next={{request.build_absolute_uri}}"><img src="{{ STATIC_URL }}images/auth/google_32_noborder.png"></a><div>Or: <a href="/socialauth/login/google?next={{request.build_absolute_uri}}">Sign Up With Google</a></div>
</div>
</div>
</div>
@ -189,7 +189,7 @@ var $j = jQuery.noConflict();
<input type="submit" class="signup" value="sign up" />
</div>
<div class="google_signup">
<a href="/socialauth/login/google?next=http://{{ request.get_host }}{{ next }}"><img src="{{ STATIC_URL }}images/auth/google_32_noborder.png"></a><div>Or: <a href="/socialauth/login/google?next=http://{{ request.get_host }}{{ next }}">Sign Up With Google</a></div>
<a href="/socialauth/login/google?next={{request.build_absolute_uri}}"><img src="{{ STATIC_URL }}images/auth/google_32_noborder.png"></a><div>Or: <a href="/socialauth/login/google?next={{request.build_absolute_uri}}">Sign Up With Google</a></div>
</div>
</div>
</div>

2
frontend/templates/registration/activation_email.txt
View File

@ -5,7 +5,7 @@ and your address will be removed from our records.
To activate this account, please click the following link within the next
{{ expiration_days }} days:
https://{{request.META.SERVER_NAME}}/accounts/activate/{{ activation_key }}
https://{{ site.domain }}/accounts/activate/{{ activation_key }}
Sincerely,
The {{ site.name }} Team

2
frontend/templates/registration/login.html
View File

@ -15,7 +15,7 @@
<br>
<br>
<h3>Or, login with:</h3>
<a href="/socialauth/login/google?next=http://{{ request.get_host }}{{ next }}"><img src="{{ STATIC_URL }}/images/auth/google_64.png"</a>
<a href="/socialauth/login/google?next={{request.build_absolute_uri}}{{ next }}"><img src="{{ STATIC_URL }}/images/auth/google_64.png"</a>
</p>
<p>

2
frontend/templates/registration/logout.html
View File

@ -3,7 +3,7 @@
{% block doccontent %}
<script type="text/javascript">
window.location.replace("http://{{ request.get_host }}/");
window.location.replace("{{request.build_absolute_uri}}/");
</script>
<div id="registration">

2
frontend/templates/registration/password_reset_email.html
View File

@ -1,7 +1,7 @@
Greetings {% if user.get_full_name %}{{ user.get_full_name }}{% else %}{{ user }}{% endif %},
You are receiving this email because you (or someone pretending to be you)
requested that your password be reset on the {{ domain }} site. If you do not
requested that your password be reset on the {{ site_name }} site. If you do not
wish to reset your password, please ignore this message.
To reset your password, please click the following link, or copy and paste it

6
frontend/templates/work.html
View File

@ -233,11 +233,11 @@ jQuery(document).ready(function(){
<h3 class="jsmod-title"><span>Share</span></h3>
<div class="jsmod-content">
<ul class="social menu">
<a href="https://www.facebook.com/sharer.php?u=http%3A%2F%2F{{ request.META.HTTP_HOST|urlencode:"" }}{{ request.path|urlencode:"" }}"><li class="facebook first"><span>Facebook</span></li></a>
<a href="https://twitter.com/intent/tweet?url=http%3A%2F%2F{{ request.META.HTTP_HOST|urlencode:"" }}{{ request.path|urlencode:"" }}&text=I'm%20ungluing%20{{ work.title|urlencode }}%20at%20%40unglueit"><li class="twitter"><span>Twitter</span></li></a>
<a href="https://www.facebook.com/sharer.php?u={{request.build_absolute_uri}}{{ request.path|urlencode:"" }}"><li class="facebook first"><span>Facebook</span></li></a>
<a href="https://twitter.com/intent/tweet?url={{request.build_absolute_uri}}{{ request.path|urlencode:"" }}&text=I'm%20ungluing%20{{ work.title|urlencode }}%20at%20%40unglueit"><li class="twitter"><span>Twitter</span></li></a>
<a href="{% url emailshare %}?next={% firstof request.path '/' %}"><li class="email"><span>Email</span></li></a>
<a href="#" id="embed"><li class="embed"><span>Embed</span></li></a>
<div id="widgetcode">Copy/paste this into your site:<br /><textarea rows="7" cols="22">&lt;iframe src="{{base_url}}/api/widget/{{work.editions.all.0.isbn_13}}/" width="152" height="325" frameborder="0"&gt;&lt;/iframe&gt;</textarea></div>
<div id="widgetcode">Copy/paste this into your site:<br /><textarea rows="7" cols="22">&lt;iframe src="{{request.build_absolute_uri}}/api/widget/{{work.editions.all.0.isbn_13}}/" width="152" height="325" frameborder="0"&gt;&lt;/iframe&gt;</textarea></div>
</ul>
</div>
</div>

1
requirements.pip
View File

@ -8,7 +8,6 @@ django-social-auth
selenium
django-nose-selenium
nose
django-profiles
django-kombu
django-celery
redis

2
settings/common.py
View File

@ -189,7 +189,7 @@ USER_AGENT = "unglue.it.bot v0.0.1 <http://unglue.it>"
SOUTH_TESTS_MIGRATE = True
AUTH_PROFILE_MODULE = "core.userprofile"
AUTH_PROFILE_MODULE = "core.UserProfile"
GOODREADS_API_KEY = ""
GOODREADS_API_SECRET = ""

2
settings/prod.py
View File

@ -3,6 +3,8 @@ from regluit.settings.common import *
DEBUG = False
TEMPLATE_DEBUG = DEBUG
SITE_ID = 2
ADMINS = (
('Ed Summers', 'ed.summers@gmail.com'),
('Raymond Yee', 'rdhyee+ungluebugs@gluejar.com'),

2
urls.py
View File

@ -10,8 +10,6 @@ urlpatterns = patterns('',
(r'^accounts/', include('registration.backends.default.urls')),
(r'^socialauth/', include('social_auth.urls')),
(r'^api/', include('regluit.api.urls')),
('^profiles/edit/$', 'profiles.views.edit_profile', {'form_class': ProfileForm,}),
(r'^profiles/', include('profiles.urls')),
(r'', include('regluit.frontend.urls')),
(r'', include('regluit.payment.urls')),
(r'^selectable/', include('selectable.urls')),