+ <%= link_to content_tag( 'span', comment.author.name() ), comment.author.url,
+ :class => 'comment-picture',
+ :style => 'background-image:url(%s)' % profile_icon(comment.author, :minor) %>
<%= _('By %{author} on %{date}') % { :author => (comment.author ? comment.author.identifier : comment.name), :date => comment.created_on } %>
diff --git a/app/views/content_viewer/_comment_form.rhtml b/app/views/content_viewer/_comment_form.rhtml
index 3dcb518..55c13aa 100644
--- a/app/views/content_viewer/_comment_form.rhtml
+++ b/app/views/content_viewer/_comment_form.rhtml
@@ -5,7 +5,8 @@
class="post_comment_box closed"
onclick="f=$(<%= comment_form_id %>); f.style.display='block';
this.className = this.className.replace(/closed/,'opened');
- f.commit.focus(); f['comment[title]'].focus()">
+ f.commit.focus(); f['comment[title]'].focus();
+ this.onclick=null">
diff --git a/app/views/content_viewer/view_page.rhtml b/app/views/content_viewer/view_page.rhtml
index 3296d13..7610170 100644
--- a/app/views/content_viewer/view_page.rhtml
+++ b/app/views/content_viewer/view_page.rhtml
@@ -1,17 +1,24 @@
+
+
<%= @page.title %>
-
- <%= _('Tags: %s') % (@page.tags.map { |t| link_to(t, tag_url(:tag => t.name)) }.join(', ')) %>
+<% if logged_in? && current_user.person.has_permission?('post_content', profile) %>
+
+ <%= link_to content_tag( 'span', _('Edit') ),
+ { :controller => 'cms', :action => 'edit', :id => @page },
+ :class => 'button with-text icon-edit' %>
+
+<% end %>
+
+
+<%= @page.tags.map { |t| link_to(t, tag_url(:tag => t.name)) }.join("\n") %>
<% if @page.parent && !@page.parent.path.blank? %>
+
<%= link_to_document(@page.parent, _('Up')) %>
+
<% end %>
-<% if logged_in? && current_user.person.has_permission?('post_content', profile) %>
- <%= link_to _('Edit'), :controller => 'cms', :action => 'edit', :id => @page %>
-<% end %>
-
-
<%= @page.to_html %>
@@ -25,10 +32,13 @@
<% end %>
-->
-
<%= _('Categories') %>
-
-<%= @page.categories.map {|item| link_to_category(item) }.join(', ') %>
+
+
<%= _('Categories') %>
+ <%= @page.categories.map {|item| link_to_category(item) }.join(', ') %>
+
<%= @comments.size == 0 ? _('No comments yet') : (n_('One comment', '%{comments} comments', @comments.size)) % { :comments => @comments.size} %>
<%= render :partial => 'comment', :collection => @comments %>
<%= render :partial => 'comment_form' %>
+
+
diff --git a/public/designs/icons/default/style.css b/public/designs/icons/default/style.css
index dd9b798..1a33715 100644
--- a/public/designs/icons/default/style.css
+++ b/public/designs/icons/default/style.css
@@ -1,4 +1,4 @@
-.icon-edit { background-image: url(gtk-edit.png) }
+.icon-edit { background-image: url(edit-HC.gif) }
.icon-home { background-image: url(gnome-home.png) }
.icon-new { background-image: url(gtk-new.png) }
.icon-close { background-image: url(cancel-HC.gif) }
diff --git a/public/designs/themes/default/stylesheets/blocks/environment-statistics-block.css b/public/designs/themes/default/stylesheets/blocks/environment-statistics-block.css
new file mode 100644
index 0000000..bf0f6c8
--- /dev/null
+++ b/public/designs/themes/default/stylesheets/blocks/environment-statistics-block.css
@@ -0,0 +1,12 @@
+
+#content .environment-statistics-block .block-title {
+ padding-left: 30px;
+ font-size: 12px;
+}
+
+#content .environment-statistics-block ul {
+ margin: 0px 0px 0px 5px;
+}
+.msie #content .environment-statistics-block ul {
+ margin: 0px 0px 0px 45px;
+}
diff --git a/public/designs/themes/default/stylesheets/blocks/main-block.css b/public/designs/themes/default/stylesheets/blocks/main-block.css
new file mode 100644
index 0000000..885be76
--- /dev/null
+++ b/public/designs/themes/default/stylesheets/blocks/main-block.css
@@ -0,0 +1,91 @@
+.article {
+ position: relative;
+ text-align: justify;
+}
+
+.article-tags {
+ text-align: right;
+ font-size: 10px;
+ margin-top: -9px;
+ padding-right: 15px;
+}
+
+.article-tags a {
+ color: #729FCF;
+ border: 1px solid #B8CFE7;
+ text-decoration: none;
+ padding: 0px 2px 1px 2px;
+}
+.article-tags a:hover {
+ color: #FFF;
+ border: 1px solid #3465A4;
+ background: #729FCF;
+}
+
+.article-actions {
+ position: absolute;
+ top: -5px;
+ right: 0px;
+ padding-right: 15px;
+}
+
+.article-parent {
+ text-align: right;
+ padding-right: 15px;
+}
+
+.article-cat {
+ position: relative;
+ border: 1px dotted #B8CFE7;
+ margin-top: 10px;
+ padding: 10px;
+}
+
+#content .article-cat h3 {
+ margin: 0px 0px 5px 0px;
+}
+
+/* * * Comments * * */
+
+.article-comment {
+ position: relative;
+ border: 1px solid #B8CFE7;
+ margin-bottom: 10px;
+ padding: 10px;
+}
+
+.comment-from-owner {
+ border: 1px solid #3465A4;
+ background: #B8CFE7;
+}
+
+#content .article-comment h4 {
+ font-size: 14px;
+ margin: 0px;
+}
+
+.comment-picture {
+ position: relative;
+ display: block;
+ width: 50px;
+ height: 50px;
+ background-repeat: no-repeat;
+ background-position: 50% 50%;
+ margin-right: 10px;
+ float: left;
+}
+.comment-picture span {
+ display: none;
+}
+
+.comment-info {
+ font-size: 10px;
+ color: #999;
+}
+.comment-from-owner .comment-info {
+ color: #729FCF;
+}
+
+.comment-text {
+ clear: left;
+}
diff --git a/public/designs/themes/default/stylesheets/blocks/profile-info-block.css b/public/designs/themes/default/stylesheets/blocks/profile-info-block.css
index 5503760..78c37da 100644
--- a/public/designs/themes/default/stylesheets/blocks/profile-info-block.css
+++ b/public/designs/themes/default/stylesheets/blocks/profile-info-block.css
@@ -13,11 +13,11 @@
}
.profile-info-data {
- width: 140px;
+ width: 110px;
font-size: 10px;
text-align: right;
position: relative;
- top: 6px;
+ top: 20px;
}
.profile-info-options {
diff --git a/public/designs/themes/default/stylesheets/blocks/recent-documents-block.css b/public/designs/themes/default/stylesheets/blocks/recent-documents-block.css
new file mode 100644
index 0000000..37e0717
--- /dev/null
+++ b/public/designs/themes/default/stylesheets/blocks/recent-documents-block.css
@@ -0,0 +1,12 @@
+
+#content .recent-documents-block .block-title {
+ padding-left: 30px;
+ font-size: 12px;
+}
+
+#content .recent-documents-block ul {
+ margin: 0px 0px 0px 5px;
+}
+.msie #content .recent-documents-block ul {
+ margin: 0px 0px 0px 45px;
+}
diff --git a/public/images/icons-app/user_icon_size-icon.png b/public/images/icons-app/user_icon_size-icon.png
new file mode 100644
index 0000000..7bf0a55
Binary files /dev/null and b/public/images/icons-app/user_icon_size-icon.png differ
diff --git a/public/images/icons-app/user_icon_size-minor.png b/public/images/icons-app/user_icon_size-minor.png
new file mode 100644
index 0000000..4df1c91
Binary files /dev/null and b/public/images/icons-app/user_icon_size-minor.png differ
diff --git a/public/images/icons-app/user_icon_size-portrait.png b/public/images/icons-app/user_icon_size-portrait.png
new file mode 100644
index 0000000..b1f88eb
Binary files /dev/null and b/public/images/icons-app/user_icon_size-portrait.png differ
diff --git a/public/images/icons-app/user_icon_size-thumb.png b/public/images/icons-app/user_icon_size-thumb.png
new file mode 100644
index 0000000..c45329c
Binary files /dev/null and b/public/images/icons-app/user_icon_size-thumb.png differ
diff --git a/public/images/icons-app/users_size-portrait.png b/public/images/icons-app/users_size-portrait.png
new file mode 100644
index 0000000..2e51953
Binary files /dev/null and b/public/images/icons-app/users_size-portrait.png differ
diff --git a/public/images/icons-app/users_size-thumb.png b/public/images/icons-app/users_size-thumb.png
new file mode 100644
index 0000000..9128425
Binary files /dev/null and b/public/images/icons-app/users_size-thumb.png differ
diff --git a/public/img-source/bg-tags.svg b/public/img-source/bg-tags.svg
new file mode 100644
index 0000000..2c9ef7a
--- /dev/null
+++ b/public/img-source/bg-tags.svg
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ image/svg+xml
+
+
+
+
+
+
diff --git a/public/stylesheets/blocks/profile-info-block.css b/public/stylesheets/blocks/profile-info-block.css
index ae95f35..603bc1d 100644
--- a/public/stylesheets/blocks/profile-info-block.css
+++ b/public/stylesheets/blocks/profile-info-block.css
@@ -13,8 +13,9 @@
margin: 0px;
}
-.profile-info-block li {
+#content .profile-info-block ul li {
list-style: none;
+ list-style-image: none;
margin: 0px;
padding: 2px;
}
diff --git a/public/stylesheets/blocks/profile-list-block.css b/public/stylesheets/blocks/profile-list-block.css
index 02b16c8..5044dee 100644
--- a/public/stylesheets/blocks/profile-list-block.css
+++ b/public/stylesheets/blocks/profile-list-block.css
@@ -12,7 +12,7 @@
padding: 0px;
}
-.common-profile-list-block li {
+#content .common-profile-list-block li {
list-style: none;
margin: 0px;
padding: 0px;
diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index 861fff7..945f6e9 100644
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -336,6 +336,11 @@ body.category4 #content h4, body.category4 #content h5, body.category4 #content
margin: 0px 0px 10px 0px;
}
+#content ul li {
+ list-style: url(/images/list-dot.gif);
+}
+
+
#better-browser-promotion {
position: absolute;
top: 100px;
diff --git a/script/resize-all-user-pics b/script/resize-all-user-pics
new file mode 100755
index 0000000..f8de8f2
--- /dev/null
+++ b/script/resize-all-user-pics
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+if ! cd public/images/0000; then
+ echo "
+ Rode esse script na raiz do Noosfero para ele redimensionar as
+ imagens dos usuarios.
+ "
+ exit 1
+fi
+
+echo "
+ Ok! We are on $(pwd)
+"
+
+thumb='100x100'
+portrait='64x64'
+minor='50x50'
+icon='20x20!'
+lista='thumb
+portrait
+minor'
+# Padrao:
_.
+
+for s in $lista icon; do
+ echo "Deletando tamanho $s"
+ find . -name "*_$s.*" | xargs -L 1 -I{} rm '{}'
+done
+
+find . -type f |
+while read img; do
+ for s in $lista; do
+ sN=$( eval "echo \$$s" )
+ echo "Criando tamanho $s ($sN) para $img"
+ name=$( echo "$img" | sed 's/^\(.*\)\.[^\.]\+$/\1/' )
+ ext=$( echo "$img" | sed 's/^.*\.\([^\.]\+\)$/\1/' )
+ convert "$img" -resize $sN "${name}_${s}.$ext"
+ done
+ echo "Criando tamanho icon ($icon) para $img"
+ convert -size $thumb xc:black -gravity Center \
+ -draw "image over 0,0 0,0 '${name}_thumb.$ext'" \
+ -resize $icon "${name}_icon.$ext"
+done
+
--
libgit2 0.21.2
<%= comment.title %>
-<%= _('Post a comment') %>
diff --git a/app/views/content_viewer/view_page.rhtml b/app/views/content_viewer/view_page.rhtml index 3296d13..7610170 100644 --- a/app/views/content_viewer/view_page.rhtml +++ b/app/views/content_viewer/view_page.rhtml @@ -1,17 +1,24 @@ +<%= @page.title %>
-<%= @page.to_html %> @@ -25,10 +32,13 @@ <% end %> --> -
<%= _('Categories') %>
- -<%= @page.categories.map {|item| link_to_category(item) }.join(', ') %> +<%= _('Categories') %>
+ <%= @page.categories.map {|item| link_to_category(item) }.join(', ') %> +<%= @comments.size == 0 ? _('No comments yet') : (n_('One comment', '%{comments} comments', @comments.size)) % { :comments => @comments.size} %>
<%= render :partial => 'comment', :collection => @comments %> <%= render :partial => 'comment_form' %> + +