My favorites | Sign in
Project Home Wiki Issues Source
READ-ONLY: This project has been archived. For more information see this post.
Search
for
  Advanced search   Search tips   Subscriptions

Issue 128 attachment: jaikuengine-site_name.diff (10.1 KB)

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
diff -uN jaikuengine.orig/common/templates/form_mobile.html jaikuengine/common/templates/form_mobile.html
--- jaikuengine.orig/common/templates/form_mobile.html 2009-07-11 23:44:47.000000000 +0700
+++ jaikuengine/common/templates/form_mobile.html 2009-07-13 15:20:50.000000000 +0700
@@ -21,7 +21,7 @@
</div>
{% else %}
<p>Your mobile phone is the quickest ticket to posting on the go.
- Activate your mobile number to post and receive {{SITE_NAME}}s via SMS.
+ Activate your mobile number to post and receive {{POST_NAME}}s via SMS.
</p>
<div class="box">
<h3>Sign in to SMS</h3>
diff -uN jaikuengine.orig/common/templates/sidebar_contacts.html jaikuengine/common/templates/sidebar_contacts.html
--- jaikuengine.orig/common/templates/sidebar_contacts.html 2009-07-11 23:44:47.000000000 +0700
+++ jaikuengine/common/templates/sidebar_contacts.html 2009-07-13 16:35:20.000000000 +0700
@@ -30,7 +30,7 @@
{% else %}
{% ifequal request.user.nick view.nick %}
<p>
- No contacts yet. You can start by <a href="/invite">inviting some friends</a>.
+ No contacts yet. You can start by <a href="{{request.user.url}}/invite">inviting some friends</a>.
</p>
{% else %}
<p>
diff -uN jaikuengine.orig/flat/templates/about.html jaikuengine/flat/templates/about.html
--- jaikuengine.orig/flat/templates/about.html 2009-07-11 23:44:30.000000000 +0700
+++ jaikuengine/flat/templates/about.html 2009-07-13 15:53:27.000000000 +0700
@@ -2,10 +2,10 @@
{% block title %}About{% endblock %}
{% block content %}

-<h1>About Jaiku</h1>
+<h1>About {{SITE_NAME}}</h1>

<p>
-Jaiku's goal is to bring people closer together by enabling them to have
+{{SITE_NAME}}'s goal is to bring people closer together by enabling them to have
conversations. It offers a way to connect with the people you care about by
sharing updates with them on the Web, <a href="/help/im">IM</a>,
and <a href="/sms">SMS</a> - as well as through
diff -uN jaikuengine.orig/flat/templates/help_index.html jaikuengine/flat/templates/help_index.html
--- jaikuengine.orig/flat/templates/help_index.html 2009-07-11 23:44:30.000000000 +0700
+++ jaikuengine/flat/templates/help_index.html 2009-07-13 15:21:20.000000000 +0700
@@ -4,7 +4,7 @@
<h2>1. What is {{SITE_NAME}}?</h2>
<p>
{{SITE_NAME}} is a way to connect with friends by sharing short messages.
- You can create your own stream of {{SITE_NAME}}s and follow your friends.
+ You can create your own stream of {{POST_NAME}}s and follow your friends.
</p>

<h2>2. How does {{SITE_NAME}} work?</h2>
@@ -15,7 +15,7 @@
latest updates. You can also add comments to the updates.
</p>

-<h2>3. Are my {{SITE_NAME}}s public?</h2>
+<h2>3. Are my {{POST_NAME}}s public?</h2>
<p>
That's up to you to decide. If you'd rather not share your stream
publicly, you can hide the updates from the public and limit their
diff -uN jaikuengine.orig/flat/templates/tour_base.html jaikuengine/flat/templates/tour_base.html
--- jaikuengine.orig/flat/templates/tour_base.html 2009-07-11 23:44:30.000000000 +0700
+++ jaikuengine/flat/templates/tour_base.html 2009-07-13 15:15:21.000000000 +0700
@@ -10,7 +10,7 @@
</li>
</ul>

- <h1>Jaiku Tour</h1>
+ <h1>{{SITE_NAME}} Tour</h1>
<div class="tour" id="tour-{{page_num}}">
<img src="/themes/{{DEFAULT_THEME}}/take-tour-{{page_num}}.jpg" class="float-right" alt="" />
{% block tour %}
diff -uN jaikuengine.orig/flat/templates/tour_contacts.html jaikuengine/flat/templates/tour_contacts.html
--- jaikuengine.orig/flat/templates/tour_contacts.html 2009-07-11 23:44:30.000000000 +0700
+++ jaikuengine/flat/templates/tour_contacts.html 2009-07-13 15:16:16.000000000 +0700
@@ -6,6 +6,6 @@
<li>Find your friends</li>
<li>Get an overview of their latest updates</li>
<li>Add comments</li>
- <li>See their availability, location, and calendar events if they have Jaiku Mobile on their phone</li>
+ <li>See their availability, location, and calendar events if they have {{SITE_NAME}} Mobile on their phone</li>
</ul>
{% endblock %}
diff -uN jaikuengine.orig/flat/templates/tour_create.html jaikuengine/flat/templates/tour_create.html
--- jaikuengine.orig/flat/templates/tour_create.html 2009-07-11 23:44:30.000000000 +0700
+++ jaikuengine/flat/templates/tour_create.html 2009-07-13 15:53:35.000000000 +0700
@@ -3,12 +3,12 @@
{% block tour %}
<h2>I. Create your activity stream</h2>
<ul>
- <li>Post new Jaikus</li>
+ <li>Post new {{POST_NAME}}s</li>
<li>Add icons</li>
<li>Customize your background</li>
<li>Add your Web feeds</li>
<li>Set your location</li>
- <li>Put a Jaiku badge on your blog</li>
+ <li>Put a {{SITE_NAME}} badge on your blog</li>
</ul>
<ul id="more">
<li id="learn-more">
Common subdirectories: jaikuengine.orig/front/templates/.svn and jaikuengine/front/templates/.svn
diff -uN jaikuengine.orig/front/templates/front.html jaikuengine/front/templates/front.html
--- jaikuengine.orig/front/templates/front.html 2009-07-11 23:44:41.000000000 +0700
+++ jaikuengine/front/templates/front.html 2009-07-13 15:53:48.000000000 +0700
@@ -6,18 +6,18 @@

{% block logo %}
<a href="/" id="logo">
- <img src="/themes/{{DEFAULT_THEME|urlencode}}/logo-big.gif" height="95" width="115" alt="Jaiku" />
+ <img src="/themes/{{DEFAULT_THEME|urlencode}}/logo-big.gif" height="95" width="115" alt="{{SITE_NAME}}" />
</a>
{% endblock %}

{% block content %}
<div id="intro">
<h2>Your Conversation.</h2>
- <h1>Welcome to Jaiku!</h1>
+ <h1>Welcome to {{SITE_NAME}}!</h1>
<ul>
<li id="create">
<h3><a href="/tour">Create your activity stream</a></h3>
- <p>Post Jaikus, add icons, customize your design, share your Web feeds</p>
+ <p>Post {{POST_NAME}}s, add icons, customize your design, share your Web feeds</p>
</li>
<li id="follow">
<h3><a href="/tour/2">Follow your friends</a></h3>
diff -uN jaikuengine.orig/front/templates/sidebar_mobile.html jaikuengine/front/templates/sidebar_mobile.html
--- jaikuengine.orig/front/templates/sidebar_mobile.html 2009-07-11 23:44:41.000000000 +0700
+++ jaikuengine/front/templates/sidebar_mobile.html 2009-07-13 15:16:39.000000000 +0700
@@ -1,5 +1,5 @@
<div id="mobile">
<div class="download">
- <p>New Jaiku Mobile: Check back soon for more updates!</p>
+ <p>New {{SITE_NAME}} Mobile: Check back soon for more updates!</p>
</div>
</div>
Common subdirectories: jaikuengine.orig/invite/templates/.svn and jaikuengine/invite/templates/.svn
diff -uN jaikuengine.orig/invite/templates/email.html jaikuengine/invite/templates/email.html
--- jaikuengine.orig/invite/templates/email.html 2009-07-11 23:44:50.000000000 +0700
+++ jaikuengine/invite/templates/email.html 2009-07-13 15:16:43.000000000 +0700
@@ -11,7 +11,7 @@

{% endwith %}

- <h2>{{view.display_nick}}'s 3 Most Recent Jaikus</h2>
+ <h2>{{view.display_nick}}'s 3 Most Recent {{POST_NAME}}s</h2>
<div id="stream">
{% include 'common/templates/stream.html' %}
</div>
diff -uN jaikuengine.orig/invite/templates/invite_base.html jaikuengine/invite/templates/invite_base.html
--- jaikuengine.orig/invite/templates/invite_base.html 2009-07-11 23:44:50.000000000 +0700
+++ jaikuengine/invite/templates/invite_base.html 2009-07-13 15:16:58.000000000 +0700
@@ -1,7 +1,7 @@
{% extends 'common/templates/base_sidebar.html' %}
{% block title %}Invitation from {{view.display_nick}}{% endblock %}
{% block sidebar %}
- <h2>Why create your profile on Jaiku?</h2>
+ <h2>Why create your profile on {{SITE_NAME}}?</h2>
<ul>
<li>Stay in touch with your close ones</li>
<li>See what's happening with your friends</li>
Common subdirectories: jaikuengine.orig/join/templates/.svn and jaikuengine/join/templates/.svn
diff -uN jaikuengine.orig/join/templates/form_join.html jaikuengine/join/templates/form_join.html
--- jaikuengine.orig/join/templates/form_join.html 2009-07-11 23:44:32.000000000 +0700
+++ jaikuengine/join/templates/form_join.html 2009-07-13 15:19:40.000000000 +0700
@@ -40,7 +40,7 @@

<div class="radio">
<input type="checkbox" name="hide" id="hide"/>
- <label for="hide">Hide my Jaikus from the public</label>
+ <label for="hide">Hide my {{POST_NAME}}s from the public</label>

{{legal_html|safe}}

diff -uN jaikuengine.orig/join/templates/welcome_done.html jaikuengine/join/templates/welcome_done.html
--- jaikuengine.orig/join/templates/welcome_done.html 2009-07-11 23:44:32.000000000 +0700
+++ jaikuengine/join/templates/welcome_done.html 2009-07-13 15:52:48.000000000 +0700
@@ -9,10 +9,10 @@
<div class="body" id="welcome-done">
<h1>Congratulations!</h1>
<p>
- You are now ready to start using Jaiku.
+ You are now ready to start using {{SITE_NAME}}.
</p>
<p>
- <a href="{{redirect_to}}">&#8250; Start using Jaiku</a>
+ <a href="{{redirect_to}}">&#8250; Start using {{SITE_NAME}}</a>
</p>
</div>
</div>
diff -uN jaikuengine.orig/join/templates/welcome_start.html jaikuengine/join/templates/welcome_start.html
--- jaikuengine.orig/join/templates/welcome_start.html 2009-07-11 23:44:32.000000000 +0700
+++ jaikuengine/join/templates/welcome_start.html 2009-07-17 09:48:53.000000000 +0700
@@ -3,9 +3,9 @@
{% block content %}

<div class="body" id="welcome-start">
- <img src="/themes/{{DEFAULT_THEME|urlencode}}/logo-welcome.gif" height="179" width="189" alt="Jaiku" />
+ <img src="/themes/{{DEFAULT_THEME|urlencode}}/logo-welcome.gif" alt="{{SITE_NAME}}" />

- <h1>Welcome to Jaiku!</h1>
+ <h1>Welcome to {{SITE_NAME}}!</h1>
<p>
Follow these 3 easy steps to get started:
</p>
Common subdirectories: jaikuengine.orig/login/templates/.svn and jaikuengine/login/templates/.svn
diff -uN jaikuengine.orig/login/templates/logout.html jaikuengine/login/templates/logout.html
--- jaikuengine.orig/login/templates/logout.html 2009-07-11 23:44:37.000000000 +0700
+++ jaikuengine/login/templates/logout.html 2009-07-13 15:20:11.000000000 +0700
@@ -3,7 +3,7 @@
{% block content %}
<h1>Session Ended</h1>
<p>
- You have signed out! You are no longer signed in to Jaiku. <br/>
+ You have signed out! You are no longer signed in to {{SITE_NAME}}. <br/>
Thanks for your visit – we hope to see you again soon!
</p>
<p>
Powered by Google Project Hosting