developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

journal list

This commit is contained in:
devin 2012-12-05 16:12:24 +08:00 committed by chris
parent d03f5dc1ff
commit 2aa077bc85
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/views/desktop/journal_lists/index.html.erb
View File

@ -8,29 +8,15 @@
<div class="g_col w4">
<ul>
<% end %>
<li class="">
<%= journal_list %>
<li class="s_grid_row">
<% title, level = journal_list %>
<%= title %> -- <%= level.join(",") %>
</li>
<% if ( i % 8 ) == 7 %>
</ul>
</div>
<% end %>
<% end %>
<<<<<<< HEAD
<li class="s_grid_row">
<% title, level = journal_list %>
<%= title %> -- <%= level.join(",") %>
</li>
<% if ( i % 5 ) == 4 %>
</ul>
</div>
<% end %>
<% end %>
=======
>>>>>>> view update
</div>
</div>
</div>