Changeset 20678 for branches


Ignore:
Timestamp:
2011/03/17 14:11:08 (15 years ago)
Author:
nanasess
bzr:base-revision:
[email protected]
bzr:committer:
Kentaro Ohkouchi <[email protected]>
bzr:file-ids:

data/Smarty/templates/admin/login_frame.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Flogin_frame.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/default/site_frame.tpl 15747@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fsite_frame.tpl
data/class/SC_View.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_View.php
bzr:mapping-version:
v4
bzr:merge:

[email protected]
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
[email protected]
bzr:revno:
3396
bzr:revprop:branch-nick:
branches/version-2_5-dev
bzr:root:
branches/version-2_5-dev
bzr:text-revisions:

data/Smarty/templates/admin/login_frame.tpl [email protected]
data/Smarty/templates/admin/main_frame.tpl [email protected]
data/Smarty/templates/default/site_frame.tpl [email protected]
data/class/SC_View.php [email protected]
bzr:timestamp:
2011-03-17 14:11:05.033999920 +0900
bzr:user-agent:
bzr2.2.1+bzr-svn1.0.4
svn:original-date:
2011-03-17T05:11:05.034000Z
Message:

#1112 (HTTPS 接続で Google ドメインの HTTP 接続)

#793 (非推奨機能の削除)

  • 未使用処理を削除
Location:
branches/version-2_5-dev/data
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • branches/version-2_5-dev/data/Smarty/templates/admin/login_frame.tpl

    r20515 r20678  
    3535    <!--{$tpl_javascript}--> 
    3636    $(function(){ 
    37         var tx = $('<input type="hidden" />') 
    38             .attr('name', '<!--{$smarty.const.TRANSACTION_ID_NAME}-->') 
    39             .val('<!--{$transactionid}-->'); 
    40         tx.appendTo('form'); 
    41  
    4237        <!--{$tpl_onload}--> 
    4338    }); 

  • branches/version-2_5-dev/data/Smarty/templates/admin/main_frame.tpl

    r20515 r20678  
    3232<link rel="stylesheet" href="<!--{$TPL_URLPATH}-->css/admin_file_manager.css" type="text/css" media="all" /> 
    3333<!--{if $tpl_mainno eq "basis"}--> 
    34 <script type="text/javascript" src="http://www.google.com/jsapi?key=xxx"></script> 
     34<!--{if ($smarty.server.HTTPS != "") && ($smarty.server.HTTPS != "off")}--> 
     35<script type="text/javascript" src="https://maps.google.com/maps/api/js?sensor=false"></script> 
     36<!--{else}--> 
     37<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script> 
     38<!--{/if}--> 
    3539<script type="text/javascript">//<![CDATA[ 
    36     google.load("maps", "3", {other_params:'sensor=false'}); 
     40    var map = new google.maps.Map(document.getElementById("maps"), {"zoom":"3"}); 
    3741//]]> 
    3842</script> 

  • branches/version-2_5-dev/data/Smarty/templates/default/site_frame.tpl

    r20558 r20678  
    2929<link rel="alternate" type="application/rss+xml" title="RSS" href="<!--{$smarty.const.HTTP_URL}-->rss/<!--{$smarty.const.DIR_INDEX_PATH}-->" /> 
    3030<!--{if $tpl_page_category == "abouts"}--> 
     31<!--{if ($smarty.server.HTTPS != "") && ($smarty.server.HTTPS != "off")}--> 
     32<script type="text/javascript" src="https://maps.google.com/maps/api/js?sensor=false"></script> 
     33<!--{else}--> 
    3134<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script> 
     35<!--{/if}--> 
    3236<script type="text/javascript">//<![CDATA[ 
    3337    var map = new google.maps.Map(document.getElementById("maps"), {"zoom":"3"}); 

  • branches/version-2_5-dev/data/class/SC_View.php

    r20540 r20678  
    5353        $this->_smarty->register_modifier('sfGetCategoryId', array("SC_Utils_Ex", 'sfGetCategoryId')); 
    5454        $this->_smarty->register_modifier('sfNoImageMainList', array("SC_Utils_Ex", 'sfNoImageMainList')); 
     55        // XXX register_function で登録すると if で使用できないのではないか？ 
    5556        $this->_smarty->register_function('sfIsHTTPS', array("SC_Utils_Ex", 'sfIsHTTPS')); 
    5657        $this->_smarty->register_function('sfSetErrorStyle', array("SC_Utils_Ex", 'sfSetErrorStyle')); 
Note: See TracChangeset for help on using the changeset viewer.