This commit is contained in:
Tobi Schäfer 2013-07-24 07:23:04 +00:00
parent cb9941ba9f
commit 69ae03b63e
10 changed files with 44 additions and 30 deletions

5
.gitattributes vendored
View file

@ -193,13 +193,16 @@ lib/jdom.jar -text svneol=unset#application/x-compressed
lib/opml-0.1.jar -text svneol=unset#application/x-compressed
lib/rome-1.0.jar -text svneol=unset#application/x-compressed
static/www/ant-icon.png -text svneol=unset#image/png
static/www/ant-white.png -text svneol=unset#image/png
static/www/ant.png -text svneol=unset#image/png
static/www/big.gif -text svneol=unset#image/gif
static/www/bullet.gif -text svneol=unset#image/gif
static/www/dot.gif -text svneol=unset#image/gif
static/www/facebook.png -text svneol=unset#image/png
static/www/facebook_round.png -text svneol=unset#image/png
static/www/formica.html svneol=native#text/html
static/www/google.png -text svneol=unset#image/png
static/www/google_round.png -text svneol=unset#image/png
static/www/headbg.gif -text svneol=unset#image/gif
static/www/helma.png -text svneol=unset#image/png
static/www/hop.gif -text svneol=unset#image/gif
@ -209,11 +212,13 @@ static/www/menu.gif -text svneol=unset#image/gif
static/www/pixel.gif -text svneol=unset#image/gif
static/www/recent.gif -text svneol=unset#image/gif
static/www/rss.png -text svneol=unset#image/png
static/www/rss_round.png -text svneol=unset#image/png
static/www/smallanim.gif -text svneol=unset#image/gif
static/www/smallchaos.gif -text svneol=unset#image/gif
static/www/smallstraight.gif -text svneol=unset#image/gif
static/www/smalltrans.gif -text svneol=unset#image/gif
static/www/status.gif -text svneol=unset#image/gif
static/www/twitter.png -text svneol=unset#image/png
static/www/twitter_round.png -text svneol=unset#image/png
static/www/webloghead.gif -text svneol=unset#image/gif
static/www/xmlbutton.gif -text svneol=unset#image/gif

View file

@ -34,14 +34,14 @@ markgettext("images");
* @name Images
* @constructor
* @property {Image} _children
* @property {Tag[]} alphabeticalGalleries
* @property {Tag[]} alphabeticalGalleries
* @property {Tag[]} galleries
* @property {Tag[]} otherGalleries
* @extends HopObject
*/
/**
*
*
* @param {String} action
* @returns {Boolean}
*/
@ -74,16 +74,16 @@ Images.prototype.main_action = function() {
skin = "$Images#main";
res.data.title = gettext("Member Images");
break;
case Layout:
images = res.handlers.layout.images;
skin = "$Images#layout";
res.data.title = gettext("Layout Images");
break;
}
res.data.list = renderList(images, "$Image#listItem",
res.data.list = renderList(images, "$Image#listItem",
10, req.queryParams.page);
res.data.pager = renderPager(images,
res.data.pager = renderPager(images,
this.href(req.action), 10, req.queryParams.page);
res.data.body = this.renderSkinAsString(skin);
res.handlers.site.renderSkin("Site#page");
@ -118,9 +118,9 @@ Images.prototype.create_action = function() {
}
Images.prototype.all_action = function() {
res.data.pager = renderPager(this, this.href(req.action),
res.data.pager = renderPager(this, this.href(req.action),
10, req.queryParams.page);
res.data.list = renderList(this, "$Image#listItem",
res.data.list = renderList(this, "$Image#listItem",
10, req.queryParams.page);
res.data.title = gettext("All Images");
res.data.body = this.renderSkinAsString("$Images#main");
@ -142,7 +142,7 @@ Images.Default = new function() {
this.width = image.width;
this.height = image.height;
this.getUrl = function() {
// Cannot use global.Image.getUrl() here because these images are
// Cannot use global.Image.getUrl() here because these images are
// located in the top-level of the static directory.
return root.getStaticUrl(name);
}
@ -200,7 +200,7 @@ Images.prototype.mergeImages = function() {
}
/**
*
*
* @param {String} group
* @returns {Tag[]}
* @see Site#getTags

View file

@ -4,11 +4,11 @@
<% gettext "To create a new site you need to fill out the form below." %>
</div>
<div class="small">
<p><% gettext 'The name will be part of the URL of your site. E.g. if you
<p><% gettext 'The name will be part of the URL of your site. E.g. if you
enter “{0}” as the name your site will be reachable via this url: {1}'
<% example.name %> <% example.href prefix="<p><code>" suffix=</code></p> %> %></p>
<p><% gettext "Please note that you cannot change the name after the site was
created." %> <% gettext "The title will appear in the header of every page
<p><% gettext "Please note that you cannot change the name after the site was
created." %> <% gettext "The title will appear in the header of every page
of your site. You can change it anytime you want." %></p>
</div>
<p>
@ -35,7 +35,7 @@
</p>
<% #sites %>
<p><% gettext "This is the directory of public sites hosted here, in
<p><% gettext "This is the directory of public sites hosted here, in
alphabetical order." %></p>
<% response.pager %>
<table border="0" cellspacing="0" cellpadding="1">
@ -81,14 +81,14 @@ alphabetical order." %></p>
<tr>
<td class="small"><% gettext 'Requests' %>:</td>
<td>
<% gettext '{0} total' <% param.requestCount %> %>,
<% gettext '{0} total' <% param.requestCount %> %>,
<% gettext '{0} last 5 min.' <% param.requestsPerUnit default=n.a. %> %>
</td>
</tr>
<tr>
<td class="small"><% gettext 'Errors' %>:</td>
<td>
<% gettext '{0} total' <% param.errorCount %> %>,
<% gettext '{0} total' <% param.errorCount %> %>,
<% gettext '{0} last 5 min.' <% param.errorsPerUnit default=n.a. %> %>
</td>
</tr>
@ -110,7 +110,7 @@ alphabetical order." %></p>
<tr>
<td class="small"><% gettext 'Memory' %>:</td>
<td>
<% gettext '{0} MB total' <% param.totalMemory %> %>,
<% gettext '{0} MB total' <% param.totalMemory %> %>,
<% gettext '{0} MB free' <% param.freeMemory %> %>
</td>
</tr>
@ -140,7 +140,7 @@ alphabetical order." %></p>
<% #stylesheet %>
/* CSS for protected skins (user interface elements etc.) */
ul { list-style: url(<% image /bullet.gif url %>) circle; }
ul { list-style: url(<% image /bullet.gif url %>) circle; }
ul.skinmgrTree {
padding-left:15px;
@ -301,3 +301,9 @@ div.skin div.title {
padding: 2px;
text-decoration: none !important;
}
.connect img {
padding: 2px 0;
vertical-align: middle;
opacity: .3;
}

View file

@ -1,7 +1,7 @@
<% #facebook %>
<script type="text/javascript">
document.writeln('<div class="antville-feature connect">');
document.writeln('<img src="<% root.static facebook.png %>" width=15 height=15/>');
document.writeln('<img src="<% root.static facebook_round.png %>" width=20 height=20/>');
document.writeln('<a href="" id="facebook_connect"><% gettext "Login with {0}" Facebook %></a>');
document.writeln('</div>');
$(function() {
@ -16,7 +16,7 @@ $(function() {
<% #twitter %>
<script type="text/javascript">
document.writeln('<div class="antville-feature connect">');
document.writeln('<img src="<% root.static twitter.png %>" width=15 height=15 />');
document.writeln('<img src="<% root.static twitter_round.png %>" width=20 height=20/>');
document.writeln('<a href="" id="twitter_connect"><% gettext "Login with {0}" Twitter %></a>');
document.writeln('</div>');
$(function() {
@ -31,7 +31,7 @@ $(function() {
<% #google %>
<script type="text/javascript">
document.writeln('<div class="antville-feature connect">');
document.writeln('<img src="<% root.static google.png %>" width=15 height=15/>');
document.writeln('<img src="<% root.static google_round.png %>" width=20 height=20/>');
document.writeln('<a href="" id="google_connect"><% gettext "Login with {0}" Google %></a>');
document.writeln('</div>');
$(function() {
@ -45,33 +45,33 @@ $(function() {
<% #facebook_profile %>
<div class="antville-feature connect">
<img src="<% root.static facebook.png %>" width=15 height=15/>
<% if <% membership.user.metadata facebook_id %> is null then
<img src="<% root.static facebook_round.png %>" width=20 height=20/>
<% if <% membership.user.metadata facebook_id %> is null then
<% members.link "connect?type=facebook" <% gettext "Connect with {0}" Facebook %> %>
else
<% members.link <% membership.user.id prefix="disconnect?type=facebook&id=" %>
else
<% members.link <% membership.user.id prefix="disconnect?type=facebook&id=" %>
<% gettext "Disconnect from {0}" Facebook %> suffix=<br> %>
%>
</div>
<% #twitter_profile %>
<div class="antville-feature connect">
<img src="<% root.static twitter.png %>" width=15 height=15/>
<img src="<% root.static twitter_round.png %>" width=20 height=20/>
<% if <% membership.user.metadata twitter_id %> is null then
<% members.link "connect?type=twitter" <% gettext "Connect with {0}" Twitter %> %>
else
<% members.link <% membership.user.id prefix="disconnect?type=twitter&id=" %>
else
<% members.link <% membership.user.id prefix="disconnect?type=twitter&id=" %>
<% gettext "Disconnect from {0}" Twitter %> suffix=<br> %>
%>
</div>
<% #google_profile %>
<div class="antville-feature connect">
<img src="<% root.static google.png %>" width=15 height=15/>
<img src="<% root.static google_round.png %>" width=20 height=20/>
<% if <% membership.user.metadata google_id %> is null then
<% members.link "connect?type=google" <% gettext "Connect with {0}" Google %> %>
else
<% members.link <% membership.user.id prefix="disconnect?type=google&id=" %>
else
<% members.link <% membership.user.id prefix="disconnect?type=google&id=" %>
<% gettext "Disconnect from {0}" Google %> suffix=<br> %>
%>
</div>

3
legal/medialoot.txt Normal file
View file

@ -0,0 +1,3 @@
Round Social Media Icons by MediaLoot.
http://medialoot.com/item/round-social-media-icons/

BIN
static/www/ant-white.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 952 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
static/www/google_round.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
static/www/rss_round.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB