[Logilogi-svn] SF.net SVN: logilogi:[1636] trunk
Status: Beta
Brought to you by:
wybow
Menu
▾
▴
[Logilogi-svn] SF.net SVN: logilogi:[1636] trunk
|
From: <wy...@us...> - 2009-11-02 19:52:34
|
Revision: 1636
http://logilogi.svn.sourceforge.net/logilogi/?rev=1636&view=rev
Author: wybow
Date: 2009-11-02 19:52:26 +0000 (Mon, 02 Nov 2009)
Log Message:
-----------
Removed old RSS stuff, added link to personal feed.
Modified Paths:
--------------
trunk/app/controllers/changes_controller.rb
trunk/app/controllers/logis_controller.rb
trunk/app/controllers/main_page_controller.rb
trunk/app/views/logis/_rated_by_peer_group.html.erb
trunk/app/views/users/edit.html.erb
trunk/public/stylesheets/logilogi.css
Added Paths:
-----------
trunk/public/images/down_button_disabled.svg
trunk/public/images/up_button_disabled.svg
Removed Paths:
-------------
trunk/app/views/changes/feed.atom.builder
trunk/app/views/logis/feed.atom.builder
Modified: trunk/app/controllers/changes_controller.rb
===================================================================
--- trunk/app/controllers/changes_controller.rb 2009-10-29 00:20:18 UTC (rev 1635)
+++ trunk/app/controllers/changes_controller.rb 2009-11-02 19:52:26 UTC (rev 1636)
@@ -43,12 +43,6 @@
self.send(@selected.to_sym)
end
end
- format.atom do
- render :template => 'changes/feed', :layout => false,
- :locals => {:title => "Recently changed Logis",
- :logis => Logi.paginate_recent_changes(
- :page => 1, :per_page => 30)}
- end
end
end
Modified: trunk/app/controllers/logis_controller.rb
===================================================================
--- trunk/app/controllers/logis_controller.rb 2009-10-29 00:20:18 UTC (rev 1635)
+++ trunk/app/controllers/logis_controller.rb 2009-11-02 19:52:26 UTC (rev 1636)
@@ -99,21 +99,6 @@
format.xml do
render :partial => 'show.xml.erb'
end
- format.atom do
- self.get_logis
- case @logi.kind
- when Const::Logi::KINDS[:user]
- title = "Recent Logis by " + @logi.home_pages_user.name
- when Const::Logi::KINDS[:peer_group]
- title = "Recently positively rated by " +
- @logi.home_pages_peer_group.name
- else
- return false
- end
- render :template => 'logis/feed', :layout => false, :locals => {
- :title => title,
- :logis => @logis}
- end
end
end
Modified: trunk/app/controllers/main_page_controller.rb
===================================================================
--- trunk/app/controllers/main_page_controller.rb 2009-10-29 00:20:18 UTC (rev 1635)
+++ trunk/app/controllers/main_page_controller.rb 2009-11-02 19:52:26 UTC (rev 1636)
@@ -42,12 +42,6 @@
format.js do
select_body(@selected)
end
- format.atom do
- render :template => 'logis/feed', :layout => false,
- :locals => {:title => "New Logis",
- :logis => Logi.recent.find( # new logis
- :all, :limit => 10)}
- end
end
end
Deleted: trunk/app/views/changes/feed.atom.builder
===================================================================
--- trunk/app/views/changes/feed.atom.builder 2009-10-29 00:20:18 UTC (rev 1635)
+++ trunk/app/views/changes/feed.atom.builder 2009-11-02 19:52:26 UTC (rev 1636)
@@ -1,35 +0,0 @@
-atom_feed do |feed|
- feed.title(title)
- feed.updated((logis.first.current_logi_version.created_at))
- feed.link "rel" => "self",
- "href" => url_for(:only_path => false, :format => 'atom')
- feed.link "rel" => "alternate",
- "href" => url_for(:only_path => false)
-
- now = Time.now
-
- logis.each do |logi|
- feed.entry(logi) do |entry|
- entry.title(logi.current_title)
- entry.link(logi_ll_url(logi))
-
- days = ((now - logi.current_logi_version.created_at) / 86400).floor
- minutes = (((now - logi.current_logi_version.created_at) / 60) - days * 1440).round
- content = (days == 0 ? _('Just yet') : days.to_s + ' ' + (days == 1 ? _('day') : _('days'))) + ' ' +
- hours_or_minutes_ago(days, minutes) + ' ' +
- (logi.current_logi_version.nr == 1 ? _('created') : _('edited')) + ' at ' +
- logi.link.to_s(:step => -1, :for => :show)
-
- entry.content(content, :type => 'text')
- entry.categories do |categories|
- logi.tags.each do |tag|
- categories.category(:term => tag.to_s(:for => :show))
- end
- end
-
- entry.author do |author|
- author.name(logi.current_logi_version.editor.name)
- end
- end
- end
-end
Modified: trunk/app/views/logis/_rated_by_peer_group.html.erb
===================================================================
--- trunk/app/views/logis/_rated_by_peer_group.html.erb 2009-10-29 00:20:18 UTC (rev 1635)
+++ trunk/app/views/logis/_rated_by_peer_group.html.erb 2009-11-02 19:52:26 UTC (rev 1636)
@@ -1,7 +1,7 @@
<div id="comments">
<%= render :partial => 'application/header', :locals => {
:title => _("Recently positively rated"),
- :link => nil} %>
+ :link => (GlobalConfig.use_log_log ? log_log_feed_link(:channel => 'for_' + @logi.home_pages_peer_group.unix_name) : nil)} %>
<% if !logis.empty? %>
<%= render :partial => 'snippets_pagination', :locals => {:logis => logis} %>
<% end %>
Deleted: trunk/app/views/logis/feed.atom.builder
===================================================================
--- trunk/app/views/logis/feed.atom.builder 2009-10-29 00:20:18 UTC (rev 1635)
+++ trunk/app/views/logis/feed.atom.builder 2009-11-02 19:52:26 UTC (rev 1636)
@@ -1,26 +0,0 @@
-atom_feed do |feed|
- feed.title(title)
- feed.updated((logis.first.created_at))
- feed.link "rel" => "self",
- "href" => url_for(:only_path => false, :format => 'atom')
- feed.link "rel" => "alternate",
- "href" => url_for(:only_path => false)
-
- logis.each do |logi|
- feed.entry(logi) do |entry|
- entry.title(logi.current_title)
- entry.link(logi_ll_url(logi))
- entry.content(logi.current_snippet + '...', :type => 'text')
-
- entry.categories do |categories|
- logi.tags.each do |tag|
- categories.category(:term => tag.to_s(:for => :show))
- end
- end
-
- entry.author do |author|
- author.name(logi.creator.name)
- end
- end
- end
-end
Modified: trunk/app/views/users/edit.html.erb
===================================================================
--- trunk/app/views/users/edit.html.erb 2009-10-29 00:20:18 UTC (rev 1635)
+++ trunk/app/views/users/edit.html.erb 2009-11-02 19:52:26 UTC (rev 1636)
@@ -42,6 +42,11 @@
<% end %>
<% end %>
+ <% render :layout => 'application/panel_with_header', :locals => {:title => _('Personal RSS feed'), :id => "personal_rss"} do %>
+ <p>Your RSS-feed is updated whenever something happens related to your logis (remarks, votes, updates, ...)</p>
+ <div class="your_feed"><p>Link: </p></div> <%= log_log_feed_link(:channel => 'for_' + current_user.unix_name) %>
+ <% end %>
+
<% render :layout => 'application/panel_with_header', :locals => {:title => _('API Key')} do %>
<p>You can use our API to remotely post and update logis</p>
<p>Your API-key is: <%= current_user.single_access_token %></p>
Added: trunk/public/images/down_button_disabled.svg
===================================================================
--- trunk/public/images/down_button_disabled.svg (rev 0)
+++ trunk/public/images/down_button_disabled.svg 2009-11-02 19:52:26 UTC (rev 1636)
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="400"
+ height="40"
+ id="svg3408"
+ sodipodi:version="0.32"
+ inkscape:version="0.46"
+ version="1.0"
+ sodipodi:docname="down_button_disabled.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ inkscape:export-filename="/home/wybo/logilogi/trunk/public/images/add_icon_16.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs3410">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective3416" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ gridtolerance="10000"
+ guidetolerance="10"
+ objecttolerance="10"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1.979899"
+ inkscape:cx="208.95176"
+ inkscape:cy="0.34176457"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1366"
+ inkscape:window-height="693"
+ inkscape:window-x="0"
+ inkscape:window-y="27" />
+ <metadata
+ id="metadata3413">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <rect
+ ry="10"
+ rx="10"
+ y="0"
+ x="-400"
+ height="40"
+ width="400"
+ id="rect6887"
+ style="fill:#818181;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.02999989999999997;stroke-opacity:1;display:inline"
+ transform="scale(-1,1)" />
+ <g
+ style="display:inline"
+ id="g5821"
+ transform="matrix(0,-1.4876271,1.2883229,0,-333.8776,581.63956)">
+ <path
+ transform="translate(-456.01531,113.93376)"
+ d="M 825.90072,162.67438 L 841.81063,153.48879 L 841.81062,171.85996 L 825.90072,162.67438 z"
+ inkscape:randomized="0"
+ inkscape:rounded="0"
+ inkscape:flatsided="true"
+ sodipodi:arg2="4.1887902"
+ sodipodi:arg1="3.1415927"
+ sodipodi:r2="5.3033009"
+ sodipodi:r1="10.606601"
+ sodipodi:cy="162.67438"
+ sodipodi:cx="836.50732"
+ sodipodi:sides="3"
+ id="path5831"
+ style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.0299999;stroke-opacity:1"
+ sodipodi:type="star" />
+ </g>
+ </g>
+</svg>
Added: trunk/public/images/up_button_disabled.svg
===================================================================
--- trunk/public/images/up_button_disabled.svg (rev 0)
+++ trunk/public/images/up_button_disabled.svg 2009-11-02 19:52:26 UTC (rev 1636)
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="400"
+ height="40"
+ id="svg3408"
+ sodipodi:version="0.32"
+ inkscape:version="0.46"
+ version="1.0"
+ sodipodi:docname="up_button_disabled.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ inkscape:export-filename="/home/wybo/logilogi/trunk/public/images/add_icon_16.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs3410">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective3416" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ gridtolerance="10000"
+ guidetolerance="10"
+ objecttolerance="10"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1.979899"
+ inkscape:cx="208.95176"
+ inkscape:cy="0.34176457"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1366"
+ inkscape:window-height="693"
+ inkscape:window-x="0"
+ inkscape:window-y="27" />
+ <metadata
+ id="metadata3413">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <rect
+ ry="10"
+ rx="10"
+ y="0"
+ x="-400"
+ height="40"
+ width="400"
+ id="rect6887"
+ style="fill:#818181;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.02999989999999997;stroke-opacity:1;display:inline"
+ transform="scale(-1,1)" />
+ <g
+ style="display:inline"
+ id="g5821"
+ transform="matrix(0,1.4876271,-1.2883229,0,378.8436,-542.53157)">
+ <path
+ transform="translate(-456.01531,113.93376)"
+ d="M 825.90072,162.67438 L 841.81063,153.48879 L 841.81062,171.85996 L 825.90072,162.67438 z"
+ inkscape:randomized="0"
+ inkscape:rounded="0"
+ inkscape:flatsided="true"
+ sodipodi:arg2="4.1887902"
+ sodipodi:arg1="3.1415927"
+ sodipodi:r2="5.3033009"
+ sodipodi:r1="10.606601"
+ sodipodi:cy="162.67438"
+ sodipodi:cx="836.50732"
+ sodipodi:sides="3"
+ id="path5831"
+ style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.0299999;stroke-opacity:1"
+ sodipodi:type="star" />
+ </g>
+ </g>
+</svg>
Modified: trunk/public/stylesheets/logilogi.css
===================================================================
--- trunk/public/stylesheets/logilogi.css 2009-10-29 00:20:18 UTC (rev 1635)
+++ trunk/public/stylesheets/logilogi.css 2009-11-02 19:52:26 UTC (rev 1636)
@@ -1180,6 +1180,14 @@
float: right;
padding-top: -2em;
}
+#personal_rss .your_feed {
+ float: left;
+}
+#personal_rss .rss_link {
+ float: left;
+ padding-left: 0.5em;
+ padding-top: 0.2em;
+}
.tab_description .rss_link {
margin-top: -0.2em;
margin-bottom: -0.2em;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|