Index: branches/version-2_5-dev/data/Smarty/templates/admin/design/bloc.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/design/bloc.tpl	(revision 19722)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/bloc.tpl	(revision 19725)
@@ -79,5 +79,5 @@
       <td><!--{$item.bloc_name}--></td>
       <td>
-        <a href="<!--{$smarty.server.PHP_SELF|escape}-->?bloc_id=<!--{$item.bloc_id}-->" >編集</a>
+        <a href="<!--{$smarty.server.PHP_SELF|escape}-->?bloc_id=<!--{$item.bloc_id}-->&amp;device_type_id=<!--{$device_type_id}-->" >編集</a>
       </td>
       <td>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/design/css.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/design/css.tpl	(revision 19722)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/css.tpl	(revision 19725)
@@ -70,5 +70,5 @@
 			<td><!--{$item.file_name}--></td>
       <td style="background:<!--{if $item.css_name == $css_name}--><!--{$smarty.const.SELECT_RGB}--><!--{else}-->#ffffff<!--{/if}-->;">
-        <a href="<!--{$smarty.server.PHP_SELF}-->?css_name=<!--{$item.css_name}-->">編集</a>
+        <a href="<!--{$smarty.server.PHP_SELF|escape}-->?css_name=<!--{$item.css_name}-->&amp;device_type_id=<!--{$device_type_id}-->">編集</a>
       </td>
       <td style="background:<!--{if $item.css_name == $css_name}--><!--{$smarty.const.SELECT_RGB}--><!--{else}-->#ffffff<!--{/if}-->;">
@@ -79,5 +79,5 @@
     <!--{else}-->
     <tr>
-      <td colspan="2">CSSファイルが存在しません。</td>
+      <td colspan="3">CSSファイルが存在しません。</td>
     </tr>
     <!--{/if}-->