diff --git a/.gitattributes b/.gitattributes index 13da87de..9a473452 100644 --- a/.gitattributes +++ b/.gitattributes @@ -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 diff --git a/code/Images/Images.js b/code/Images/Images.js index f2741465..6a8a7d41 100644 --- a/code/Images/Images.js +++ b/code/Images/Images.js @@ -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 diff --git a/code/Root/$Root.skin b/code/Root/$Root.skin index 49b8bf2f..9b658cab 100644 --- a/code/Root/$Root.skin +++ b/code/Root/$Root.skin @@ -4,11 +4,11 @@ <% gettext "To create a new site you need to fill out the form below." %>
<% gettext 'The name will be part of the URL of your site. E.g. if you +
<% 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="
" suffix=
<% 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 +
<% 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." %>
@@ -35,7 +35,7 @@
<% #sites %> -<% gettext "This is the directory of public sites hosted here, in +
<% gettext "This is the directory of public sites hosted here, in alphabetical order." %>
<% response.pager %>| <% gettext 'Requests' %>: | - <% gettext '{0} total' <% param.requestCount %> %>, + <% gettext '{0} total' <% param.requestCount %> %>, <% gettext '{0} last 5 min.' <% param.requestsPerUnit default=n.a. %> %> |
| <% gettext 'Errors' %>: | - <% gettext '{0} total' <% param.errorCount %> %>, + <% gettext '{0} total' <% param.errorCount %> %>, <% gettext '{0} last 5 min.' <% param.errorsPerUnit default=n.a. %> %> |
| <% gettext 'Memory' %>: | - <% gettext '{0} MB total' <% param.totalMemory %> %>, + <% gettext '{0} MB total' <% param.totalMemory %> %>, <% gettext '{0} MB free' <% param.freeMemory %> %> |