Changeset 19738 for branches/version-2_5-dev/data/class

Timestamp:

2010/12/17 19:06:33 (16 years ago)

Author:

nanasess

bzr:base-revision:

[email protected]

bzr:committer:

Kentaro Ohkouchi <[email protected]>

bzr:file-ids:

data/Smarty/templates/admin/basis/subnavi.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fbasis%2Fsubnavi.tpl
data/Smarty/templates/admin/contents/subnavi.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fcontents%2Fsubnavi.tpl
data/Smarty/templates/admin/customer/search_customer.tpl 18068@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fcustomer%2Fsearch_customer.tpl
data/Smarty/templates/admin/customer/subnavi.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fcustomer%2Fsubnavi.tpl
data/Smarty/templates/admin/design/subnavi.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fdesign%2Fsubnavi.tpl
data/Smarty/templates/admin/home.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fhome.tpl
data/Smarty/templates/admin/mail/subnavi.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fmail%2Fsubnavi.tpl
data/Smarty/templates/admin/main_frame.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fmain_frame.tpl
data/Smarty/templates/admin/order/edit.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Forder%2Fedit.tpl
data/Smarty/templates/admin/order/subnavi.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Forder%2Fsubnavi.tpl
data/Smarty/templates/admin/ownersstore/log.tpl 16413@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fownersstore%2Flog.tpl
data/Smarty/templates/admin/ownersstore/subnavi.tpl 16413@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fownersstore%2Fsubnavi.tpl
data/Smarty/templates/admin/plugin/index.tpl 18370@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fplugin%2Findex.tpl
data/Smarty/templates/admin/plugin/install.tpl 18370@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fplugin%2Finstall.tpl
data/Smarty/templates/admin/plugin/subnavi.tpl 18370@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fplugin%2Fsubnavi.tpl
data/Smarty/templates/admin/plugin/uninstall.tpl 18370@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fplugin%2Funinstall.tpl
data/Smarty/templates/admin/products/subnavi.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fproducts%2Fsubnavi.tpl
data/Smarty/templates/admin/system/subnavi.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fsystem%2Fsubnavi.tpl
data/Smarty/templates/admin/total/subnavi.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Ftotal%2Fsubnavi.tpl
data/class/SC_Initial.php 16506@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_Initial.php
data/class/pages/admin/LC_Page_Admin_Logout.php 15289@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2FLC_Page_Admin_Logout.php
data/class/pages/admin/basis/LC_Page_Admin_Basis_ZipInstall.php 15335@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fbasis%2FLC_Page_Admin_Basis_ZipInstall.php
data/class/pages/admin/mail/LC_Page_Admin_Mail.php 15640@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fmail%2FLC_Page_Admin_Mail.php
data/class/pages/admin/mail/LC_Page_Admin_Mail_Sendmail.php 16321@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fmail%2FLC_Page_Admin_Mail_Sendmail.php
data/mtb_constants_init.php 16505@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fmtb_constants_init.php
html/install/sql/insert_data.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Finsert_data.sql
html/upgrade/index.php 16383@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Fupgrade%2Findex.php
html/user_data/plugins/google_analytics/admin/index.php 18370@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fhtml%2Fuser_data%2Fplugins%2Fgoogle_analytics%2Fadmin%2Findex.php
html/user_data/plugins/recommend/admin/index.php 18371@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fhtml%2Fuser_data%2Fplugins%2Frecommend%2Fadmin%2Findex.php

bzr:mapping-version:

v4

bzr:merge:

[email protected]

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

[email protected]

bzr:revno:

2467

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/Smarty/templates/admin/basis/subnavi.tpl [email protected]
data/Smarty/templates/admin/contents/subnavi.tpl [email protected]
data/Smarty/templates/admin/customer/search_customer.tpl [email protected]
data/Smarty/templates/admin/customer/subnavi.tpl [email protected]
data/Smarty/templates/admin/design/subnavi.tpl [email protected]
data/Smarty/templates/admin/home.tpl [email protected]
data/Smarty/templates/admin/mail/subnavi.tpl [email protected]
data/Smarty/templates/admin/main_frame.tpl [email protected]
data/Smarty/templates/admin/order/edit.tpl [email protected]
data/Smarty/templates/admin/order/subnavi.tpl [email protected]
data/Smarty/templates/admin/ownersstore/log.tpl [email protected]
data/Smarty/templates/admin/ownersstore/subnavi.tpl [email protected]
data/Smarty/templates/admin/plugin/index.tpl [email protected]
data/Smarty/templates/admin/plugin/install.tpl [email protected]
data/Smarty/templates/admin/plugin/subnavi.tpl [email protected]
data/Smarty/templates/admin/plugin/uninstall.tpl [email protected]
data/Smarty/templates/admin/products/subnavi.tpl [email protected]
data/Smarty/templates/admin/system/subnavi.tpl [email protected]
data/Smarty/templates/admin/total/subnavi.tpl [email protected]
data/class/SC_Initial.php [email protected]
data/class/pages/admin/LC_Page_Admin_Logout.php [email protected]
data/class/pages/admin/basis/LC_Page_Admin_Basis_ZipInstall.php [email protected]
data/class/pages/admin/mail/LC_Page_Admin_Mail.php [email protected]
data/class/pages/admin/mail/LC_Page_Admin_Mail_Sendmail.php [email protected]
data/mtb_constants_init.php [email protected]
html/install/sql/insert_data.sql [email protected]
html/upgrade/index.php [email protected]
html/user_data/plugins/google_analytics/admin/index.php [email protected]
html/user_data/plugins/recommend/admin/index.php [email protected]

bzr:timestamp:

2010-12-17 19:06:16.793999910 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2010-12-17T10:06:16.794000Z

Message:

#841(管理画面のディレクトリ名をパラメータに)

• "admin/" とベタ書きになっていた箇所を ADMIN_DIR に置きかえ

Location:

branches/version-2_5-dev/data/class

Files:

• SC_Initial.php (modified) (1 diff)
• pages/admin/LC_Page_Admin_Logout.php (modified) (1 diff)
• pages/admin/basis/LC_Page_Admin_Basis_ZipInstall.php (modified) (1 diff)
• pages/admin/mail/LC_Page_Admin_Mail.php (modified) (1 diff)
• pages/admin/mail/LC_Page_Admin_Mail_Sendmail.php (modified) (1 diff)

branches/version-2_5-dev/data/class/SC_Initial.php

@@ -85 +85 @@
             define('SMARTPHONE_URL_DIR', URL_DIR . SMARTPHONE_DIR);
 
-            define('ADMIN_DIR', 'admin/'); // TODO
+            define('ADMIN_DIR', 'admin/');
         }
     }

branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Logout.php

@@ -55 +55 @@
         $objSess->logout();
 
-        $this->objDisplay->redirect($this->getLocation(URL_DIR . "admin/" . DIR_INDEX_URL));
+        $this->objDisplay->redirect($this->getLocation(URL_DIR . ADMIN_DIR . DIR_INDEX_URL));
     }
 

branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_ZipInstall.php

@@ -184 +184 @@
         SC_Utils_Ex::sfFlush(true);
 
-        echo "<img src='" . $img_path . "admin/basis/zip_install_progress.gif'><br />";
+        echo "<img src='" . $img_path . ADMIN_DIR . "basis/zip_install_progress.gif'><br />";
         echo "<img src='" . $img_path . "install/space_w.gif'>";
         SC_Utils_Ex::sfFlush();

branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php

@@ -364 +364 @@
                     if (MELMAGA_SEND) {
                         if (MELMAGA_BATCH_MODE) {
-                            $this->objDisplay->redirect($this->getLocation(URL_DIR . 'admin/mail/history.php'));
+                            $this->objDisplay->redirect($this->getLocation(URL_DIR . ADMIN_DIR . 'mail/history.php'));
                         } else {
-                            $this->objDisplay->redirect($this->getLocation(URL_DIR . 'admin/mail/sendmail.php', array('mode' => 'now', 'send_id' => $sendId)));
+                            $this->objDisplay->redirect($this->getLocation(URL_DIR . ADMIN_DIR . 'mail/sendmail.php', array('mode' => 'now', 'send_id' => $sendId)));
                         }
                         exit;

branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Sendmail.php

@@ -178 +178 @@
         }
         if ($_GET['mode'] == 'now') {
-            $this->objDisplay->redirect($this->getLocation(URL_DIR . 'admin/mail/history.php'));
+            $this->objDisplay->redirect($this->getLocation(URL_DIR . ADMIN_DIR . 'mail/history.php'));
         }
         echo "complete\n";