-
- <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap', :not_load_scraps => true}, :update => "profile-wall-message-response-#{scrap.id}", :success =>"hide_and_show(['#profile-wall-form-#{scrap.id}'],['#profile-wall-message-response-#{scrap.id}'])" do %>
+
<%= render :partial => 'profile_scrap_reply_form', :locals => { :scrap => scrap } %>
diff --git a/app/views/profile/_upload_image.rhtml b/app/views/profile/_upload_image.rhtml
index 118a275..7d2a986 100644
--- a/app/views/profile/_upload_image.rhtml
+++ b/app/views/profile/_upload_image.rhtml
@@ -1 +1,4 @@
-<%= render :partial => 'default_activity', :locals => {:activity => activity} %>
+
+ <%= render :partial => 'default_activity', :locals => {:activity => activity} %>
+
+
diff --git a/public/designs/icons/tango/style.css b/public/designs/icons/tango/style.css
index cc3d2bc..678d581 100644
--- a/public/designs/icons/tango/style.css
+++ b/public/designs/icons/tango/style.css
@@ -91,7 +91,7 @@
.icon-lock { background-image: url(Tango/16x16/actions/lock.png) }
.icon-chat { background-image: url(Tango/16x16/apps/internet-group-chat.png); background-repeat: no-repeat }
.icon-reply { background-image: url(Tango/16x16/actions/mail-reply-sender.png) }
-.icon-newforum { background-image: url(Tango/16x16/apps/system-users.png) }
+.icon-newforum { background-image: url(Tango/16x16/apps/internet-group-chat.png) }
.icon-forum { background-image: url(Tango/16x16/apps/system-users.png) }
.icon-gallery { background-image: url(Tango/16x16/mimetypes/image-x-generic.png) }
.icon-newgallery { background-image: url(Tango/16x16/mimetypes/image-x-generic.png) }
diff --git a/public/designs/templates/leftbar/stylesheets/style.css b/public/designs/templates/leftbar/stylesheets/style.css
index 6b65ea2..a8beae4 100644
--- a/public/designs/templates/leftbar/stylesheets/style.css
+++ b/public/designs/templates/leftbar/stylesheets/style.css
@@ -23,3 +23,15 @@
#profile-wall ul {
width: 620px;
}
+
+.profile-activity-lead {
+ width: 534px;
+}
+
+#profile-wall textarea {
+ width: 534px;
+}
+
+#profile-wall #leave_scrap textarea {
+ width: 640px;
+}
diff --git a/public/designs/templates/rightbar/stylesheets/style.css b/public/designs/templates/rightbar/stylesheets/style.css
index 3ec2a08..48ac3a4 100644
--- a/public/designs/templates/rightbar/stylesheets/style.css
+++ b/public/designs/templates/rightbar/stylesheets/style.css
@@ -23,3 +23,15 @@
#profile-wall ul {
width: 620px;
}
+
+.profile-activity-lead {
+ width: 534px;
+}
+
+#profile-wall textarea {
+ width: 534px;
+}
+
+#profile-wall #leave_scrap textarea {
+ width: 640px;
+}
diff --git a/public/images/forum-activity-bg.png b/public/images/forum-activity-bg.png
new file mode 100644
index 0000000..b6e7926
Binary files /dev/null and b/public/images/forum-activity-bg.png differ
diff --git a/public/images/forum-activity-icon.png b/public/images/forum-activity-icon.png
new file mode 100644
index 0000000..acadece
Binary files /dev/null and b/public/images/forum-activity-icon.png differ
diff --git a/public/images/gallery-image-activity-border-big.png b/public/images/gallery-image-activity-border-big.png
new file mode 100644
index 0000000..358302c
Binary files /dev/null and b/public/images/gallery-image-activity-border-big.png differ
diff --git a/public/images/gallery-image-activity-border.png b/public/images/gallery-image-activity-border.png
index 7b125f2..15dd635 100644
Binary files a/public/images/gallery-image-activity-border.png and b/public/images/gallery-image-activity-border.png differ
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index b92dd42..b08d61c 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -5884,8 +5884,9 @@ h1#agenda-title {
display: block;
padding: 10px;
margin-bottom: 10px;
- background-color: #f0f0f1;
- border-bottom: 0;
+ background-color: #fff;
+ border-bottom: 1px solid #e8e8e8;
+ position: relative;
}
.profile-activity-lead img {
@@ -5901,6 +5902,32 @@ h1#agenda-title {
margin: 5px 0;
}
+.profile-activity-article-forum .profile-activity-lead {
+ height: 50px;
+ width: 297px;
+ padding-left: 60px;
+ float: none;
+ overflow: hidden;
+ background: transparent url(/images/forum-activity-bg.png) left center no-repeat;
+}
+
+.profile-activity-article-forum .see-forum {
+ text-align: right;
+}
+
+.profile-activity-article-forum .see-forum a {
+ background: transparent url(/images/forum-activity-icon.png) left center no-repeat;
+ padding-left: 30px;
+ font-weight: bold;
+ color: #dadada !important;
+ text-decoration: none;
+ font-size: 11px;
+}
+
+.profile-activity-article-forum .profile-activity-lead b {
+ font-weight: normal;
+}
+
#profile-activity li a, #profile-network li a, #profile-wall li a,
#profile-wall .profile-wall-send-reply {
color: #333;
@@ -5908,7 +5935,7 @@ h1#agenda-title {
.profile-activity-text {
margin: 0;
- color: #808080;
+ color: #000;
}
#profile-wall li.profile-activity-item.upload_image span,
@@ -5924,6 +5951,16 @@ h1#agenda-title {
position: absolute;
}
+#profile-wall li.profile-activity-item.upload_image .activity-gallery-images-count-1 span,
+#profile-wall li.profile-activity-item.upload_image .activity-gallery-images-count-1 span img,
+#profile-wall li.profile-activity-item.upload_image .activity-gallery-images-count-1 span a,
+#profile-network li.profile-activity-item.upload_image .activity-gallery-images-count-1 span,
+#profile-network li.profile-activity-item.upload_image .activity-gallery-images-count-1 span img,
+#profile-network li.profile-activity-item.upload_image .activity-gallery-images-count-1 span a {
+ width: 383px;
+ height: 177px;
+}
+
#profile-wall li.profile-activity-item.upload_image span,
#profile-network li.profile-activity-item.upload_image span {
position: relative;
@@ -5937,6 +5974,11 @@ h1#agenda-title {
text-indent: -5000em;
}
+#profile-wall li.profile-activity-item.upload_image .activity-gallery-images-count-1 span a,
+#profile-network li.profile-activity-item.upload_image .activity-gallery-images-count-1 span a {
+ background-image: url(/images/gallery-image-activity-border-big.png);
+}
+
#profile-wall li.profile-activity-item.upload_image .article-comment span,
#profile-wall li.profile-activity-item.upload_image .profile-wall-actions span,
#profile-network li.profile-activity-item.upload_image .article-comment span,
@@ -6058,9 +6100,8 @@ h1#agenda-title {
.profile-wall-actions a {
display: block;
float: right;
- font-size: 11px;
- margin: 0;
- margin-left: 10px;
+ font-size: 10px;
+ margin: 2px 0 3px 10px;
color: #ccc;
padding: 0;
}
@@ -6163,8 +6204,9 @@ h1#agenda-title {
}
.profile-network-sender,
+.profile-activity-sender,
.profile-wall-sender {
- margin: 2px 0;
+ margin: 0;
}
#profile-activity .profile-activity-time,
@@ -6181,6 +6223,13 @@ h1#agenda-title {
overflow: hidden;
}
+#profile-network li textarea:focus,
+#profile-wall li textarea:focus {
+ background-position: left center;
+ background-repeat: no-repeat;
+ text-indent: 28px;
+}
+
.profile-network-message,
.profile-wall-message {
margin: 0;
@@ -6258,7 +6307,7 @@ h1#agenda-title {
#profile-wall .profile-wall-activities-comments li,
#profile-network .profile-wall-activities-comments li {
- background: #e8e8e8;
+ background: #f0f0f1;
border-bottom: 1px solid #d2d2d2 !important;
border-top: 1px solid #fff;
margin-bottom: 0;
@@ -6300,10 +6349,17 @@ h1#agenda-title {
#profile-wall .profile-wall-activities-comments .article-comment .button-bar,
#profile-network .profile-wall-activities-comments .article-comment .button-bar {
- float: none !important;
+ float: right;
padding: 0;
text-align: right;
position: static;
+ clear: none;
+ display: none;
+}
+
+#profile-wall .profile-wall-activities-comments .article-comment:hover .button-bar,
+#profile-network .profile-wall-activities-comments .article-comment:hover .button-bar {
+ display: block;
}
#profile-wall .profile-wall-activities-comments .article-comment .button-bar a.button,
@@ -6314,7 +6370,7 @@ h1#agenda-title {
line-height: auto;
color: #333;
text-decoration: none;
- font-size: 11px;
+ font-size: 10px;
padding: 0;
margin: 0;
display: inline;
@@ -6332,7 +6388,6 @@ h1#agenda-title {
display: inline;
position: static;
display: inline;
- margin-right: -5px;
}
/* friends online {{{ */
@@ -6473,7 +6528,7 @@ h1#agenda-title {
.profile-wall-reply-form {
display: block;
- background: #e8e8e8;
+ background: #f0f0f1;
border-bottom: 1px solid #d2d2d2;
border-top: 1px solid #fff;
margin-left: 50px;
@@ -6518,6 +6573,10 @@ h1#agenda-title {
width: 375px;
}
+#profile-wall #leave_scrap textarea {
+ width: 442px;
+}
+
.profile-wall-scrap-replies {
width: 100%;
position: relative;
--
libgit2 0.21.2
<%= link_to activity.user.name, activity.user.url %>
- <%= image_tag(activity.params['first_image']) unless activity.params['first_image'].blank? %><%= strip_tags(activity.params['lead']).gsub(/(\xA0|\xC2|\s)+/, ' ').gsub(/^\s+/, '') %> <%= link_to(_('See more +'), activity.params['url']) unless activity.get_lead.blank? %>
+ <%= image_tag(activity.params['first_image']) unless activity.params['first_image'].blank? %><%= strip_tags(activity.params['lead']).gsub(/(\xA0|\xC2|\s)+/, ' ').gsub(/^\s+/, '') %> <%= link_to(_('See more'), activity.params['url']) unless activity.get_lead.blank? %>
<%= time_ago_as_sentence(activity.created_at) + ' ' + _('ago') %>
<%= link_to activity.user.name, activity.user.url %> <%= describe activity %>
<%= time_ago_as_sentence(activity.created_at) + ' ' + _('ago') %>