[xoops-cvslog 2670] CVS update: xoops2jp/html/modules/base/admin/templates

Back to archive index

Minahito minah****@users*****
2006年 4月 6日 (木) 16:54:38 JST


Index: xoops2jp/html/modules/base/admin/templates/block_uninstall.html
diff -u xoops2jp/html/modules/base/admin/templates/block_uninstall.html:1.1.2.2 xoops2jp/html/modules/base/admin/templates/block_uninstall.html:1.1.2.3
--- xoops2jp/html/modules/base/admin/templates/block_uninstall.html:1.1.2.2	Thu Apr  6 15:00:56 2006
+++ xoops2jp/html/modules/base/admin/templates/block_uninstall.html	Thu Apr  6 16:54:38 2006
@@ -1,7 +1,11 @@
 <p><{$smarty.const._AD_BASE_MESSAGE_CONFIRM_DELETE}></p>
 
 <div class="tips">
-  <{$smarty.const._AD_BASE_TIPS_BLOCK_UNINSTALL}>
+  <{if $object->get('block_type') == 'C'}>
+    <{$smarty.const._AD_BASE_TIPS_CUSTOM_BLOCK_UNINSTALL}>
+  <{else}>
+    <{$smarty.const._AD_BASE_TIPS_BLOCK_UNINSTALL}>
+  <{/if}>
 </div>
 
 <table class="outer" cellspacing="1">
Index: xoops2jp/html/modules/base/admin/templates/blockinstall_edit.html
diff -u xoops2jp/html/modules/base/admin/templates/blockinstall_edit.html:1.1.2.1 xoops2jp/html/modules/base/admin/templates/blockinstall_edit.html:1.1.2.2
--- xoops2jp/html/modules/base/admin/templates/blockinstall_edit.html:1.1.2.1	Wed Apr  5 19:58:23 2006
+++ xoops2jp/html/modules/base/admin/templates/blockinstall_edit.html	Thu Apr  6 16:54:38 2006
@@ -10,12 +10,6 @@
   <{xoops_input type=hidden name=bid value=$actionForm->getVar('bid')}>
   <table class="outer" cellspacing="1">
     <tr>
-      <th><{$smarty.const._AD_BASE_LANG_NAME}></th>
-      <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=name value=$actionForm->getVar('name') size=15 maxlength=150}>
-      </td>
-    </tr>
-    <tr>
       <th><{$smarty.const._AD_BASE_LANG_TITLE}></th>
       <td class="<{cycle values="odd,even"}>">
         <{xoops_input type=text name=title value=$actionForm->getVar('title') size=15 maxlength=255}>
@@ -40,7 +34,9 @@
     <tr>
       <th><{$smarty.const._AD_BASE_LANG_BCACHETIME}></th>
       <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=bcachetime value=$actionForm->getVar('bcachetime')}>
+        <select name='bcachetime'>
+          <{xoops_optionsArray from=$cachetimeArr value=cachetime label=label default=$actionForm->get('bcachetime')}>
+        </select>
       </td>
     </tr>
     <tr>
Index: xoops2jp/html/modules/base/admin/templates/block_list.html
diff -u xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.2 xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.3
--- xoops2jp/html/modules/base/admin/templates/block_list.html:1.1.2.2	Thu Apr  6 15:01:02 2006
+++ xoops2jp/html/modules/base/admin/templates/block_list.html	Thu Apr  6 16:54:38 2006
@@ -1,4 +1,11 @@
-<div style="text-align:right;">[ <a href="index.php?action=BlockInstallList"><{$smarty.const._AD_BASE_LANG_BLOCK_INSTALL}></strong></a> ]</div>
+<div class="tips">
+  <{$smarty.const._AD_BASE_TIPS_ADD_CUSTOM_BLOCK}>
+</div>
+
+<div style="text-align:right;">
+  [ <a href="index.php?action=BlockInstallList"><{$smarty.const._AD_BASE_LANG_BLOCK_INSTALL}></a> ]
+  [ <a href="index.php?action=CustomBlockEdit"><{$smarty.const._AD_BASE_LANG_ADD_CUSTOM_BLOCK}></a> ]
+</div>
 <br/>
 <table class="outer" cellspacing="1">
   <tr>
@@ -37,7 +44,13 @@
   <{foreach item=obj from=$objects}>
     <tr class="<{cycle values='odd,even'}>">
       <td><{$obj->getVar('bid')}></td>
-      <td><{$obj->mModule->getVar('name')}></td>
+      <td>
+        <{if $obj->mModule}>
+          <{$obj->mModule->getVar('name')}>
+        <{else}>
+          &nbsp;
+        <{/if}>
+      </td>
       <td><{$obj->getVar('name')}></td>
       <td><{$obj->getVar('title')}></td>
       <td><{if $obj->mColumn}><{$obj->mColumn->getVar('name')}><{/if}></td>
@@ -47,7 +60,11 @@
       <td><{if $obj->mCachetime}><{$obj->mCachetime->getVar('label')}><{/if}></td>
       <td><{$obj->getVar('last_modified')|xoops_formattimestamp:l}></td>
       <td>
-        <a href="./index.php?action=BlockEdit&amp;bid=<{$obj->getVar('bid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" /></a>
+        <{if $obj->get('block_type') == 'C'}>
+          <a href="./index.php?action=CustomBlockEdit&amp;bid=<{$obj->getVar('bid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" /></a>
+        <{else}>
+          <a href="./index.php?action=BlockEdit&amp;bid=<{$obj->getVar('bid')}>"><img src="<{"icons/edit.gif"|theme}>" alt="<{$smarty.const._EDIT}>" /></a>
+        <{/if}>
         <a href="./index.php?action=BlockUninstall&amp;bid=<{$obj->getVar('bid')}>"><img src="<{"icons/uninstall.gif"|theme}>" alt="<{$smarty.const._DELETE}>" /></a>
       </td>
     </tr>
Index: xoops2jp/html/modules/base/admin/templates/blockinstall_list.html
diff -u xoops2jp/html/modules/base/admin/templates/blockinstall_list.html:1.1.2.1 xoops2jp/html/modules/base/admin/templates/blockinstall_list.html:1.1.2.2
--- xoops2jp/html/modules/base/admin/templates/blockinstall_list.html:1.1.2.1	Wed Apr  5 19:58:23 2006
+++ xoops2jp/html/modules/base/admin/templates/blockinstall_list.html	Thu Apr  6 16:54:38 2006
@@ -1,7 +1,10 @@
 <div class="tips">
   <{$smarty.const._AD_BASE_TIPS_INSTALL_BLOCK}>
 </div>
-
+<div style="text-align:right;">
+  [ <a href="index.php?action=CustomBlockEdit"><{$smarty.const._AD_BASE_LANG_ADD_CUSTOM_BLOCK}></a> ]
+</div>
+<br/>
 <table class="outer" cellspacing="1">
   <tr>
     <th><{$smarty.const._AD_BASE_LANG_BID}><br />
@@ -30,7 +33,13 @@
   <{foreach item=obj from=$objects}>
     <tr class="<{cycle values='odd,even'}>">
       <td><{$obj->getVar('bid')}></td>
-      <td><{$obj->mModule->getVar('name')}></td>
+      <td>
+        <{if $obj->mModule}>
+          <{$obj->mModule->getVar('name')}>
+        <{else}>
+          &nbsp;
+        <{/if}>
+      </td>
       <td><{$obj->getVar('name')}></td>
       <td><{$obj->getVar('title')}></td>
       <td><{$obj->getVar('block_type')}></td>
@@ -38,6 +47,9 @@
       <td><{$obj->getVar('template')}></td>
       <td>
         <a href="./index.php?action=BlockInstallEdit&bid=<{$obj->getVar('bid')}>"><img src="<{"icons/install.gif"|theme}>" alt="<{$smarty.const._MD_A_BASE_LANG_INSTALL}>" /></a>
+        <{if $obj->get('block_type') == 'C'}>
+          <a href="./index.php?action=CustomBlockDelete&amp;bid=<{$obj->getVar('bid')}>"><img src="<{"icons/delete.gif"|theme}>" alt="<{$smarty.const._DELETE}>" /></a>
+        <{/if}>
       </td>
     </tr>
   <{/foreach}>
Index: xoops2jp/html/modules/base/admin/templates/block_edit.html
diff -u xoops2jp/html/modules/base/admin/templates/block_edit.html:1.1.2.3 xoops2jp/html/modules/base/admin/templates/block_edit.html:1.1.2.4
--- xoops2jp/html/modules/base/admin/templates/block_edit.html:1.1.2.3	Thu Apr  6 15:01:02 2006
+++ xoops2jp/html/modules/base/admin/templates/block_edit.html	Thu Apr  6 16:54:38 2006
@@ -10,12 +10,6 @@
   <{xoops_input type=hidden name=bid value=$actionForm->getVar('bid')}>
   <table class="outer" cellspacing="1">
     <tr>
-      <th><{$smarty.const._AD_BASE_LANG_NAME}></th>
-      <td class="<{cycle values="odd,even"}>">
-        <{xoops_input type=text name=name value=$actionForm->getVar('name') size=15 maxlength=150}>
-      </td>
-    </tr>
-    <tr>
       <th><{$smarty.const._AD_BASE_LANG_TITLE}></th>
       <td class="<{cycle values="odd,even"}>">
         <{xoops_input type=text name=title value=$actionForm->getVar('title') size=15 maxlength=255}>


xoops-cvslog メーリングリストの案内
Back to archive index