[Logilogi-svn] SF.net SVN: logilogi:[1628] trunk
Status: Beta
Brought to you by:
wybow
Menu
▾
▴
[Logilogi-svn] SF.net SVN: logilogi:[1628] trunk
|
From: <wy...@us...> - 2009-10-26 22:45:27
|
Revision: 1628
http://logilogi.svn.sourceforge.net/logilogi/?rev=1628&view=rev
Author: wybow
Date: 2009-10-26 22:45:09 +0000 (Mon, 26 Oct 2009)
Log Message:
-----------
Paths usable now
Modified Paths:
--------------
trunk/app/views/layouts/_foot.html.erb
trunk/app/views/logis/_logi.html.erb
trunk/app/views/logis/_steps.html.erb
trunk/public/images/select.png
trunk/public/images/select.svg
trunk/public/stylesheets/logilogi.css
Added Paths:
-----------
trunk/public/images/down_button.svg
trunk/public/images/next_button.svg
trunk/public/images/up_button.svg
Modified: trunk/app/views/layouts/_foot.html.erb
===================================================================
--- trunk/app/views/layouts/_foot.html.erb 2009-10-26 20:56:11 UTC (rev 1627)
+++ trunk/app/views/layouts/_foot.html.erb 2009-10-26 22:45:09 UTC (rev 1628)
@@ -60,6 +60,15 @@
'stretch_side' : 'right'});
mcorners.add('div.insert_button', {'scaled_image' : 'insert_button.svg',
'corner_size' : 7, 'stretch_side' : 'right'});
+ mcorners.add('div.up_button', {
+ 'scaled_image' : 'up_button.svg', 'corner_size' : 7,
+ 'stretch_side' : 'right'});
+ mcorners.add('div.down_button', {
+ 'scaled_image' : 'down_button.svg', 'corner_size' : 7,
+ 'stretch_side' : 'right'});
+ mcorners.add('div.next_button', {
+ 'scaled_image' : 'next_button.svg', 'corner_size' : 7,
+ 'stretch_side' : 'right'});
mcorners.prepare_defered();
mcorners.run();
<% end -%>
Modified: trunk/app/views/logis/_logi.html.erb
===================================================================
--- trunk/app/views/logis/_logi.html.erb 2009-10-26 20:56:11 UTC (rev 1627)
+++ trunk/app/views/logis/_logi.html.erb 2009-10-26 22:45:09 UTC (rev 1628)
@@ -8,4 +8,14 @@
<%= yield %>
<div class="spacer"></div>
</div>
+ <% if local_assigns[:action] == :view and @path
+ index = @path.steps.index(@path.steps.detect {|s| s.logi == @logi})
+ next_logi = @path.steps[index + 1].logi %>
+ <div class="next_step">
+ <%= button_to 'Next', logi_ll_url(next_logi),
+ :class => 'next_button' %>
+ <span class="link">Next on read-path: <%= logi_ll_link(next_logi, :show => :title, :length => 48) %></span>
+ <div class="spacer"></div>
+ </div>
+ <% end %>
</div>
Modified: trunk/app/views/logis/_steps.html.erb
===================================================================
--- trunk/app/views/logis/_steps.html.erb 2009-10-26 20:56:11 UTC (rev 1627)
+++ trunk/app/views/logis/_steps.html.erb 2009-10-26 22:45:09 UTC (rev 1628)
@@ -1,4 +1,35 @@
-<% steps.each do |step| %>
+<% if steps.size > 11
+ index = steps.index(steps.detect {|s| s.logi == current_logi})
+ if index + 6 > steps.size
+ i_start = steps.size - 11
+ else
+ i_start = index - 5
+ end
+ i_start = 0 if i_start < 0
+ if index < 6
+ i_end = 10
+ else
+ i_end = index + 6
+ end
+ i_end = steps.size if i_end > steps.size
+ puts i_end
+ puts steps.size
+%>
+ <% if index > 1 %>
+ <%= button_to 'Previous', logi_ll_url(steps[index - 1].logi),
+ :class => 'up_button' %>
+ <div class="spacer"></div>
+ <% end %>
+ <% if i_start != 0 %>
+ <div class="step">
+ <div class="level2">
+ ...
+ </div>
+ </div>
+ <% end %>
+<% end %>
+
+<% steps[i_start...i_end].each do |step| %>
<% if current_logi == step.logi %>
<div class="step step_current">
<div class="panel_content_padding">
@@ -16,3 +47,17 @@
</div>
<% end %>
<% end %>
+<% if steps.size > 11 %>
+ <% if i_end != steps.size %>
+ <div class="step">
+ <div class="level2">
+ ...
+ </div>
+ </div>
+ <% end %>
+ <% if index + 1 < steps.size %>
+ <div class="spacer"></div>
+ <%= button_to 'Next', logi_ll_url(steps[index + 1].logi),
+ :class => 'down_button' %>
+ <% end %>
+<% end %>
Added: trunk/public/images/down_button.svg
===================================================================
--- trunk/public/images/down_button.svg (rev 0)
+++ trunk/public/images/down_button.svg 2009-10-26 22:45:09 UTC (rev 1628)
@@ -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="next_down_button.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:#30367e;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/next_button.svg
===================================================================
--- trunk/public/images/next_button.svg (rev 0)
+++ trunk/public/images/next_button.svg 2009-10-26 22:45:09 UTC (rev 1628)
@@ -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="next_button.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:#30367e;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(-1.4876271,0,0,-1.2883229,580.56856,375.91459)">
+ <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/images/select.png
===================================================================
(Binary files differ)
Modified: trunk/public/images/select.svg
===================================================================
--- trunk/public/images/select.svg 2009-10-26 20:56:11 UTC (rev 1627)
+++ trunk/public/images/select.svg 2009-10-26 22:45:09 UTC (rev 1628)
@@ -16,7 +16,7 @@
version="1.0"
sodipodi:docname="select.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
- inkscape:export-filename="/home/bruno/Documents/work/GNU/logilogi.org/trunk/public/images/select.png"
+ inkscape:export-filename="/home/wybo/logilogi/trunk/public/images/select.png"
inkscape:export-xdpi="60.75"
inkscape:export-ydpi="60.75">
<defs
@@ -67,9 +67,9 @@
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1151"
- inkscape:window-height="727"
+ inkscape:window-height="689"
inkscape:window-x="55"
- inkscape:window-y="24" />
+ inkscape:window-y="27" />
<metadata
id="metadata3413">
<rdf:RDF>
@@ -120,9 +120,9 @@
inkscape:rounded="0"
inkscape:randomized="0"
d="M 287.82253,-15.882627 L 273.24625,-15.882627 L 258.66996,-15.882628 L 265.9581,-28.506061 L 273.24625,-41.129496 L 280.53439,-28.506062 L 287.82253,-15.882627 z"
- transform="matrix(-0.9246239,0,0,-0.9246239,631.88385,-6.3296086)" />
+ transform="matrix(-0.9246239,0,0,-0.9246239,627.88385,-6.3296086)" />
<path
- transform="matrix(-0.9246239,0,0,-0.9246239,631.88385,33.670392)"
+ transform="matrix(-0.9246239,0,0,-0.9246239,627.88385,33.670392)"
d="M 287.82253,-15.882627 L 273.24625,-15.882627 L 258.66996,-15.882628 L 265.9581,-28.506061 L 273.24625,-41.129496 L 280.53439,-28.506062 L 287.82253,-15.882627 z"
inkscape:randomized="0"
inkscape:rounded="0"
Added: trunk/public/images/up_button.svg
===================================================================
--- trunk/public/images/up_button.svg (rev 0)
+++ trunk/public/images/up_button.svg 2009-10-26 22:45:09 UTC (rev 1628)
@@ -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="previous_button.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:#30367e;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-26 20:56:11 UTC (rev 1627)
+++ trunk/public/stylesheets/logilogi.css 2009-10-26 22:45:09 UTC (rev 1628)
@@ -271,6 +271,20 @@
padding-top: 0.3em;
padding-bottom: 0.3em;
}
+#paths .button {
+ float: left;
+}
+.next_step {
+ padding-bottom: 0.8em;
+}
+.next_step .button {
+ margin-right: 0;
+}
+.next_step .link {
+ float: right;
+ margin-top: 1em;
+ margin-right: 1em;
+}
/* panels with tabs */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|