merge v04

[pettanr/pettanr.git] / app / views / system / browse.html.erb

diff --git a/app/views/system/browse.html.erb b/app/views/system/browse.html.erb
index b7eb7fa..d8c3075 100644 (file)
--- a/app/views/system/browse.html.erb
+++ b/app/views/system/browse.html.erb
@@ -15,45 +15,45 @@
   </tr>
   <tr>
     <td>
-      <%= link_to 'original_pictures', :controller => 'original_pictures', :action => :list %>
+      <%= link_to 'stories', :controller => 'stories', :action => :list %>
     </td>
   </tr>
   <tr>
     <td>
-      <%= link_to 'resource_pictures', :controller => 'resource_pictures', :action => :list %>
+      <%= link_to 'original_pictures', :controller => 'original_pictures', :action => :list %>
     </td>
   </tr>
   <tr>
     <td>
-      <%= link_to 'panel_pictures', :controller => 'panel_pictures', :action => :list %>
+      <%= link_to 'resource_pictures', :controller => 'resource_pictures', :action => :list %>
     </td>
   </tr>
   <tr>
     <td>
-      <%= link_to 'balloons', :controller => 'balloons', :action => :list %>
+      <%= link_to 'panel_pictures', :controller => 'panel_pictures', :action => :list %>
     </td>
   </tr>
   <tr>
     <td>
-      <%= link_to 'speaches', :controller => 'speaches', :action => :list %>
+      <%= link_to 'speech_balloons', :controller => 'speech_balloons', :action => :list %>
     </td>
   </tr>
-</table>
-フキダシテンプレート関連
-<table>
   <tr>
     <td>
-      <%= link_to 'speach_balloons', :controller => 'speach_balloons', :action => :list %>
+      <%= link_to 'balloons', :controller => 'balloons', :action => :list %>
     </td>
   </tr>
   <tr>
     <td>
-      <%= link_to 'balloon_templates', :controller => 'balloon_templates', :action => :list %>
+      <%= link_to 'speeches', :controller => 'speeches', :action => :list %>
     </td>
   </tr>
+</table>
+フキダシテンプレート関連
+<table>
   <tr>
     <td>
-      <%= link_to 'speach_templates', :controller => 'speach_templates', :action => :list %>
+      <%= link_to 'speech_balloon_templates', :controller => 'speech_balloon_templates', :action => :list %>
     </td>
   </tr>
 </table>
@@ -71,17 +71,12 @@
   </tr>
   <tr>
     <td>
-      <%= link_to 'lesences', :controller => 'licenses', :action => :list %>
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <%= link_to 'common lesences', :controller => 'common_licenses', :action => :list %>
+      <%= link_to 'licenses', :controller => 'licenses', :action => :list %>
     </td>
   </tr>
   <tr>
     <td>
-      <%= link_to 'original lesences', :controller => 'original_licenses', :action => :list %>
+      <%= link_to 'license_groups', :controller => 'license_groups', :action => :list %>
     </td>
   </tr>
   <tr>