Changeset 17569
- Timestamp:
- 2008/08/28 10:33:23 (16 years ago)
- Location:
- branches/comu-ver2
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/comu-ver2/data/Smarty/templates/default/bloc/calendar.tpl
r17073 r17569 21 21 *}--> 22 22 <!--▼カレンダーここから--> 23 <div id="block-calendar" class="block-contents"> 24 <h2><img src="<!--{$TPL_DIR}-->img/top/calendar.jpg" width="400" height="29" alt="カレンダー" /></h2> 25 26 23 <div id="block-calendar"> 27 24 <!--{section name=num loop=$arrCalendar}--> 28 25 <!--{assign var=arrCal value=`$arrCalendar[num]`}--> 29 26 <!--{section name=cnt loop=$arrCal}--> 30 31 27 <!--{if $smarty.section.cnt.first}--> 32 28 <table> … … 34 30 <thead><tr><th>日</th><th>月</th><th>火</th><th>水</th><th>木</th><th>金</th><th>土</th></tr></thead> 35 31 <!--{/if}--> 36 37 32 <!--{if $arrCal[cnt].first}--> 38 33 <tr> 39 34 <!--{/if}--> 40 41 35 <!--{if !$arrCal[cnt].in_month}--> 42 36 <td></td> … … 46 40 <td><!--{$arrCal[cnt].day}--></td> 47 41 <!--{/if}--> 48 49 42 <!--{if $arrCal[cnt].last}--> 50 43 </tr> 51 44 <!--{/if}--> 52 53 45 <!--{/section}--> 54 46 <!--{if $smarty.section.cnt.last}--> … … 56 48 <!--{/if}--> 57 49 <!--{/section}--> 58 59 60 50 </div> 61 51 <!--▲カレンダーここまで--> -
branches/comu-ver2/data/class/SC_Initial.php
r17478 r17569 39 39 /** EC-CUBEのバージョン */ 40 40 // XXX SVNのリビジョンを付加できたら良いと思う。(方法が分からない。) 41 define('ECCUBE_VERSION', "2. 1.1-comu");41 define('ECCUBE_VERSION', "2.2.0-comu"); 42 42 } 43 43 -
branches/comu-ver2/data/class/pages/LC_Page.php
r17453 r17569 216 216 */ 217 217 function getLocation($path, $param = array(), $useSSL = "escape") { 218 219 // $path が / で始まっている場合 220 if (substr($path, 0, 1) == "/") { 221 $realPath = realpath(HTML_PATH . substr_replace($path, "", 0, strlen(URL_DIR))); 222 // 相対パスの場合 223 } else { 224 $realPath = realpath($path); 225 } 226 227 // FIXME OS依存の処理は別クラスに分ける? 228 // Windowsの場合は, ディレクトリの区切り文字を\から/に変換する 229 if (substr(PHP_OS, 0, 3) == 'WIN') { 230 $realPath = str_replace("\\", "/", $realPath); 231 $htmlPath = str_replace("\\", "/", HTML_PATH); 232 $rootPath = str_replace($htmlPath, "", $realPath); 233 } else { 234 // HTML_PATH を削除した文字列を取得. 235 $rootPath = str_replace(HTML_PATH, "", $realPath); 236 } 237 218 $rootPath = $this->getRootPath($path); 238 219 239 220 // スキーマを定義 … … 261 242 } 262 243 244 function getRootPath($path) { 245 // $path が / で始まっている場合 246 if (substr($path, 0, 1) == "/") { 247 $realPath = realpath(HTML_PATH . substr_replace($path, "", 0, strlen(URL_DIR))); 248 // 相対パスの場合 249 } else { 250 $realPath = realpath($path); 251 } 252 253 // HTML_PATH を削除した文字列を取得. 254 // FIXME OS依存の処理は別クラスに分ける? 255 // Windowsの場合は, ディレクトリの区切り文字を\から/に変換する 256 if (substr(PHP_OS, 0, 3) == 'WIN') { 257 $realPath = str_replace("\\", "/", $realPath); 258 $htmlPath = str_replace("\\", "/", HTML_PATH); 259 $rootPath = str_replace($htmlPath, "", $realPath); 260 } else { 261 $htmlPath = rtrim(HTML_PATH, "/"); 262 $rootPath = str_replace($htmlPath, "", $realPath); 263 $rootPath = ltrim($rootPath, "/"); 264 } 265 266 return $rootPath; 267 } 268 263 269 /** 264 270 * ページをリロードする. -
branches/comu-ver2/data/class/pages/admin/order/LC_Page_Admin_Order_Pdf.php
r17305 r17569 163 163 $this->objFormParam->addParam("ダウンロード方法", "download", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK")); 164 164 $this->objFormParam->addParam("帳票タイトル", "title", STEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK")); 165 $this->objFormParam->addParam("帳票メッセージ1行目", "msg1", STEXT_LEN , "KVa", array("MAX_LENGTH_CHECK"));166 $this->objFormParam->addParam("帳票メッセージ2行目", "msg2", STEXT_LEN , "KVa", array("MAX_LENGTH_CHECK"));167 $this->objFormParam->addParam("帳票メッセージ3行目", "msg3", STEXT_LEN , "KVa", array("MAX_LENGTH_CHECK"));165 $this->objFormParam->addParam("帳票メッセージ1行目", "msg1", STEXT_LEN*3/5, "KVa", array("MAX_LENGTH_CHECK")); 166 $this->objFormParam->addParam("帳票メッセージ2行目", "msg2", STEXT_LEN*3/5, "KVa", array("MAX_LENGTH_CHECK")); 167 $this->objFormParam->addParam("帳票メッセージ3行目", "msg3", STEXT_LEN*3/5, "KVa", array("MAX_LENGTH_CHECK")); 168 168 $this->objFormParam->addParam("備考1行目", "etc1", STEXT_LEN, "KVa", array("MAX_LENGTH_CHECK")); 169 169 $this->objFormParam->addParam("備考2行目", "etc2", STEXT_LEN, "KVa", array("MAX_LENGTH_CHECK")); -
branches/comu-ver2/data/class/pages/admin/products/LC_Page_Admin_Products.php
r17567 r17569 330 330 331 331 // カテゴリの読込 332 $this->arrCatList = $objDb->sfGetCategoryList();333 $this->arrCat IDName = $this->lfGetIDName($this->arrCatList);332 list($this->arrCatKey, $this->arrCatVal) = $objDb->sfGetLevelCatList(false); 333 $this->arrCatList = $this->lfGetIDName($this->arrCatKey, $this->arrCatVal); 334 334 335 335 // 画面の表示 … … 399 399 400 400 // カテゴリIDをキー、カテゴリ名を値にする配列を返す。 401 function lfGetIDName($arrCat List) {402 $max = count($arrCat List);401 function lfGetIDName($arrCatKey, $arrCatVal) { 402 $max = count($arrCatKey); 403 403 for ($cnt = 0; $cnt < $max; $cnt++ ) { 404 $key = isset($arrCat List[$cnt]['category_id']) ? $arrCatList[$cnt]['category_id'] : "";405 $val = isset($arrCat List[$cnt]['category_name']) ? $arrCatList[$cnt]['category_name'] : "";404 $key = isset($arrCatKey[$cnt]) ? $arrCatKey[$cnt] : ""; 405 $val = isset($arrCatVal[$cnt]) ? $arrCatVal[$cnt] : ""; 406 406 $arrRet[$key] = $val; 407 407 } -
branches/comu-ver2/data/class/util/SC_Utils.php
r17567 r17569 127 127 $objPage->return_top = $return_top; 128 128 $objPage->err_msg = $err_msg; 129 $objPage->is_mobile = $is_mobile;129 $objPage->is_mobile = (defined('MOBILE_SITE')) ? true : false; 130 130 $objPage->process(); 131 131 exit; -
branches/comu-ver2/html/user_data/packages/default/css/index.css
r17479 r17569 78 78 font-size: 100%; 79 79 } 80 81 /* ブロック - カレンダー82 ----------------------------------------------- */83 #block-calendar {border: 1px solid #CCCCCC;padding: 0 0 10px;}84 #block-calendar h2 {85 /*86 height: 29px;87 text-indent: -9999em;88 background: url(../images/tit-calendar.gif) 0 0 no-repeat;89 */90 }91 #block-calendar table {92 border-collapse: collapse;93 margin: 0 auto 10px;94 text-align:center;95 }96 #block-calendar th, #block-calendar td {97 padding: 2px;98 border: 1px solid #CCCCCC;99 }100 #block-calendar th {101 background: #FF8144;102 color: #FFFFFF;103 }104 #block-calendar .off {105 background: #FFEECC;106 color: #E04A00;107 }108 #block-calendar caption {color: #DD4400;} -
branches/comu-ver2/html/user_data/packages/default/css/main.css
r17519 r17569 360 360 } 361 361 362 /* カレンダー 363 ----------------------------------------------- */ 364 #block-calendar { 365 } 366 367 #block-calendar table { 368 border-collapse: collapse; 369 margin: 0 auto 10px; 370 text-align:center; 371 } 372 373 #block-calendar th, #block-calendar td { 374 padding: 2px; 375 border: 1px solid #CCCCCC; 376 } 377 378 #block-calendar th { 379 background: #FF8144; 380 color: #FFFFFF; 381 } 382 383 #block-calendar .off { 384 background: #FFEECC; 385 color: #E04A00; 386 } 387 388 #block-calendar caption { 389 color: #DD4400; 390 } 391 362 392 363 393 /* バナー
Note: See TracChangeset
for help on using the changeset viewer.