ここの情報は古いです。ご理解頂いた上でお取り扱いください。

Changeset 10616


Ignore:
Timestamp:
Feb 3, 2009, 10:01:48 PM (13 years ago)
Author:
ShogoKawahara
Message:

#3470:added translation in pc_frontend of opOpenSocialPlugin and fixed some layout

Location:
OpenPNE3/plugins/opOpenSocialPlugin/trunk
Files:
2 added
18 edited

Legend:

Unmodified
Added
Removed
  • OpenPNE3/plugins/opOpenSocialPlugin/trunk/apps/pc_frontend/modules/application/actions/actions.class.php

    r10296 r10616  
    255255    {
    256256      $memberApp->delete();
     257
     258      $this->getUser()->setFlash('notice', 'The application was removed successfully.');
     259
    257260      $this->redirect('application/list');
    258261    }
     262    $this->appTitle = $memberApp->getApplication()->getTitle();
    259263    return sfView::SUCCESS;
    260264  }
  • OpenPNE3/plugins/opOpenSocialPlugin/trunk/apps/pc_frontend/modules/application/config/view.yml

    r10252 r10616  
    2020    - %SF_PROTOTYPE_WEB_DIR%/js/prototype
    2121
     22infoSuccess:
     23  stylesheets:
     24    - /opOpenSocialPlugin/css/opensocial
     25
    2226jsSuccess:
    2327  has_layout: off
  • OpenPNE3/plugins/opOpenSocialPlugin/trunk/apps/pc_frontend/modules/application/templates/_gadget.php

    r10594 r10616  
    66  if ($hasSetting)
    77  {
    8     echo link_to_app_setting(__('設定'), $mid, true);
     8    echo link_to_app_setting(__('Settings'), $mid, true);
    99  }
    1010}
    1111else
    1212{
    13   echo link_to(__('このアプリを追加する'),"application/add?id=".$aid);
     13  echo link_to(__('Add this application'),"application/add?id=".$aid);
    1414}
    1515?></p>
  • OpenPNE3/plugins/opOpenSocialPlugin/trunk/apps/pc_frontend/modules/application/templates/_gadgetApplication.php

    r10261 r10616  
    1212else
    1313{
    14   include_box('HomeApplicationError', __('エラー'), __('アプリケーションが正常にロードできませんでした。'));
     14  include_box('HomeApplicationError', __('Error'), __('Failed in loading the application.'));
    1515}
  • OpenPNE3/plugins/opOpenSocialPlugin/trunk/apps/pc_frontend/modules/application/templates/_informationBox.php

    r10186 r10616  
    1 <div id="<?php echo $id ?>" class="dparts box<?php
     1<div id="<?php echo $id ?>" class="dparts box applicationInfoBox<?php
    22if ($isOwner)
    33{
     
    1717
    1818<div class="body">
    19 <div class="app_thumbnail">
     19<div class="applicationThumbnail">
    2020<?php if ($application->getThumbnail()) : ?>
    2121<?php echo image_tag($application->getThumbnail(), array('alt' => $application->getTitle())) ?>
     
    2323</div>
    2424
    25 <div class="app_info">
    26 <div class="app_description">
     25<div class="info">
     26<div class="description">
    2727<?php echo $application->getDescription() ?>
    2828</div>
    2929
    3030<?php if ($application->getAuthor()) : ?>
    31 <div class="app_author">
     31<div class="author">
    3232<?php if ($application->getAuthorEmail()) : ?>
    3333<?php echo __('Author') ?>: <?php echo mail_to($application->getAuthorEmail() , $application->getAuthor(), array('encode' => true)) ?>
     
    3838<?php endif; ?>
    3939</div>
    40 </div>
    4140
    42 <div class="app_option">
     41<div class="operation">
    4342<ul>
    4443<?php if($isOwner) : ?>
    45 <li><?php echo link_to_app_setting(__('設定'), $mid); ?></li>
    46 <li><?php echo link_to(__('削除'), 'application/remove?id='.$mid); ?></li>
     44<li><?php echo link_to_app_setting(__('Settings'), $mid); ?></li>
     45<li><?php echo link_to(__('Remove'), 'application/remove?id='.$mid); ?></li>
    4746<?php else : ?>
    48 <?php echo link_to(__('このアプリを追加する'), 'application/add?id='.$aid) ?>
     47<li><?php echo link_to(__('Add this application'), 'application/add?id='.$aid) ?></li>
    4948<?php endif ?>
    50 <?php echo link_to(__('詳細'), 'application/info?id='.$aid) ?>
     49<li><?php echo link_to(__('Information'), 'application/info?id='.$aid) ?></li>
     50</div>
    5151</div>
    5252
  • OpenPNE3/plugins/opOpenSocialPlugin/trunk/apps/pc_frontend/modules/application/templates/addError.php

    r10474 r10616  
    1 <?php include_box('ApplicationAddError',__('アプリケーション追加'), __('アプリケーションの追加に失敗しました。')) ?>
     1<?php include_box('ApplicationAddError',__('Error'), __('Failed in adding the application.')) ?>
    22
    33<?php use_helper('Javascript') ?>
  • OpenPNE3/plugins/opOpenSocialPlugin/trunk/apps/pc_frontend/modules/application/templates/gallerySuccess.php

    r9741 r10616  
    11<?php use_helper('OpenSocial'); ?>
    22
    3 <?php include_box('searchApplication',__('アプリケーション検索'),'',
    4 array('form' => $filters, 'url' => 'application/gallery', 'button' => __('検索'))) ?>
     3<?php include_box('searchApplication',__('Search Applications'),'',
     4array('form' => $filters, 'url' => 'application/gallery', 'button' => __('Search'))) ?>
    55
    66<?php if ($pager->getNbResults()): ?>
    7 <?php echo pager_navigation($pager, 'application/gallery?page=%d'); ?>
     7<div class="pagerRelative"><p class="number"><?php echo pager_navigation($pager, 'application/gallery?page=%d'); ?></p></div>
    88<?php foreach($pager->getResults() as $application) : ?>
    99<?php include_application_information_box(
     
    1515) ?>
    1616<?php endforeach ?>
    17 <?php echo pager_navigation($pager, 'application/gallery?page=%d'); ?>
     17<div class="pagerRelative"><p><?php echo pager_navigation($pager, 'application/gallery?page=%d'); ?></p></div>
    1818<?php else : ?>
    19 <?php include_box('ApplicationGalleryError', __('アプリケーション検索'), __('該当するアプリケーションは見つかりませんでした。')) ?>
     19<?php include_box('ApplicationGalleryError', __('Search Results'), __('Your search queries did not match any applications.')) ?>
    2020<?php endif ?>
  • OpenPNE3/plugins/opOpenSocialPlugin/trunk/apps/pc_frontend/modules/application/templates/infoSuccess.php

    r9778 r10616  
     1<div class="applicationInfo">
    12<?php
    23$appInfoList = array(
    3   __('アプリケーション名')  => $application->getTitleUrl() ? link_to($application->getTitle(), $application->getTitleUrl(), array('target' => '_blank')) : $application->getTitle(),
    4   __('スクリーンショット')  => $application->getScreenshot() ? image_tag($application->getScreenshot(), array('alt' => $application->getTitle())) : '',
    5   __('サムネイル')          => $application->getThumbnail() ? image_tag($application->getThumbnail(), array('alt' => $application->getTitle())) : '',
    6   __('詳細') => $application->getDescription(),
    7   __('インストールしているメンバ数') => $application->countInstalledMember(),
     4  __('Name')  => $application->getTitleUrl() ? link_to($application->getTitle(), $application->getTitleUrl(), array('target' => '_blank')) : $application->getTitle(),
     5  __('Screen Shot')  => '<div class="applicationScreenShot">'.($application->getScreenshot() ? image_tag($application->getScreenshot(), array('alt' => $application->getTitle())) : '').'</div>',
     6  __('Thumbnail')    => '<div class="applicationThumbnail">'.($application->getThumbnail() ? image_tag($application->getThumbnail(), array('alt' => $application->getTitle())) : '').'</div>',
     7  __('Description') => $application->getDescription(),
     8  __('Users') => $application->countInstalledMember(),
    89);
    910$authorInfoList = array(
    10   __('作成者') => $application->getAuthorEmail() ? mail_to($application->getAuthorEmail(), $application->getAuthor(), array('encode' => true)) : $application->getAuthor(),
    11   __('所属')   => $application->getAuthorAffiliation(),
    12   __('作者について') => $application->getAuthorAboutme(),
    13   __('写真')   => $application->getAuthorPhoto() ? image_tag($application->getAuthorPhoto(), array('alt' => $application->getAuthor())) : '',
    14   __('リンク') => $application->getAuthorLink() ? link_to(null , $application->getAuthorLink(), array('target' => '_blank')) : '',
    15   __('引用')   => $application->getAuthorQuote(),
     11  __('Name') => $application->getAuthorEmail() ? mail_to($application->getAuthorEmail(), $application->getAuthor(), array('encode' => true)) : $application->getAuthor(),
     12  __('Affiliation')   => $application->getAuthorAffiliation(),
     13  __('Aboutme') => $application->getAuthorAboutme(),
     14  __('Photo')   => $application->getAuthorPhoto() ? image_tag($application->getAuthorPhoto(), array('alt' => $application->getAuthor())) : '',
     15  __('Link') => $application->getAuthorLink() ? link_to(null , $application->getAuthorLink(), array('target' => '_blank')) : '',
     16  __('Quote')   => $application->getAuthorQuote(),
    1617);
    17 include_list_box('ApplicationInfoList', $appInfoList, array('title' => __('アプリケーション詳細')));
    18 include_list_box('AuthorInfoList', $authorInfoList, array('title' => __('作成者情報')));
    19 echo link_to(__('このアプリを追加する'), 'application/add?id='.$application->getId());
     18include_list_box('ApplicationInfoList', $appInfoList, array('title' => __('About Application')));
     19include_list_box('AuthorInfoList', $authorInfoList, array('title' => __('About Author')));
    2020?>
    21 
     21<div class="moreInfo">
     22<ul class="moreInfo"><li><?php echo link_to(__('Add this application'), 'application/add?id='.$application->getId()); ?></li></ul>
     23</div>
     24</div>
     25<?php use_helper('Javascript') ?>
     26<?php op_include_line('backLink', link_to_function(__('Back to previous page'), 'history.back()')) ?>
  • OpenPNE3/plugins/opOpenSocialPlugin/trunk/apps/pc_frontend/modules/application/templates/jsSuccess.php

    r9239 r10616  
    1 var web_prefix = "<?php echo url_for('@homepage') ?>";
     1var web_prefix = "<?php echo $sf_request->getScriptName() ?>";
    22
  • OpenPNE3/plugins/opOpenSocialPlugin/trunk/apps/pc_frontend/modules/application/templates/listError.php

    r10474 r10616  
    1 <?php include_box('ApplicationListError', __('アプリケーション追加'), __('アプリケーションの追加に失敗しました。')) ?>
     1<?php include_box('ApplicationListError', __('Error'), __('Failed in adding the application.')) ?>
    22
    33<?php use_helper('Javascript') ?>
  • OpenPNE3/plugins/opOpenSocialPlugin/trunk/apps/pc_frontend/modules/application/templates/listSuccess.php

    r10186 r10616  
    22
    33<?php if ($isOwner) : ?>
    4 <?php echo link_to(__('Application Gallery'), 'application/gallery') ?>
    54<?php if ($isAddApplication) : ?>
    6 <?php include_box('form','アプリケーション追加','',array(
    7   'form' => array($form),
    8   'url' => 'application/list',
    9   'button' => 'add'
     5<?php op_include_form('form', $form ,array(
     6  'title' => __('Add a new application'),
     7  'url' => url_for('application/list'),
     8  'button' => __('Add'),
    109)) ?>
    1110<?php endif ?>
    1211<?php endif ?>
     12<div class="applicationList">
    1313<?php if (isset($memberApps) && count($memberApps)) : ?>
    1414<div id="order">
     
    3232));
    3333} ?>
    34 <?php else: ?>
    35 <?php include_box('ApplicationListError',__('アプリケーションリスト'), __('インストールされたアプリケーションがありません。')) ?>
    3634<?php endif ?>
     35<?php if ($isOwner): ?>
     36<div class="moreInfo">
     37<ul class="moreInfo">
     38<li>
     39<?php echo link_to(__('Application Gallery'), 'application/gallery') ?>
     40</li>
     41</ul>
     42</div>
     43<?php endif ?>
     44</div>
  • OpenPNE3/plugins/opOpenSocialPlugin/trunk/apps/pc_frontend/modules/application/templates/removeSuccess.php

    r9735 r10616  
    1 <?php include_box('ApplicationRemoveConfirm',__('アプリケーション削除確認'),
    2   __('本当にこのアプリケーションを削除しますか?').'<br />'.
    3   '<form action="'.url_for('application/remove?id='.$sf_request->getParameter('id')).'" method="post">
    4   <input type="submit" value="'.__('はい').'" />
    5   </form>'
     1<?php
     2$options = array(
     3  'title'  => __('Remove the application').": ".$appTitle,
     4  'body'   => __('Do you really delete this application?'),
     5  'no_url' =>  url_for('application/list'),
     6  'no_method' => 'get',
    67);
     8
     9op_include_yesno('ApplicationRemoveConfirm', new sfForm(), new sfForm(array(),array(),false), $options);
     10
  • OpenPNE3/plugins/opOpenSocialPlugin/trunk/apps/pc_frontend/modules/application/templates/settingSuccess.php

    r10252 r10616  
    1515<?php endif ?>
    1616
    17 <?php include_box('formAppSetting', __('アプリケーション設定: ').$appName, '', array(
     17<?php include_box('formAppSetting', __('Application Settings').': '.$appName, '', array(
    1818  'form' => $forms,
    1919  'url' => 'application/setting?id='.$sf_request->getParameter('id').'&is_reload='.$sf_request->getParameter('is_reload',false)
  • OpenPNE3/plugins/opOpenSocialPlugin/trunk/apps/pc_frontend/modules/prefs/actions/actions.class.php

    r10130 r10616  
    3737      $key   = $request->getParameter('name');
    3838      $value = $request->getParameter('value');
    39       $token = BasicSecurityToken::createFromToken($st, 60);
     39      $token = opBasicSecurityToken::createFromToken($st, 60);
    4040      $modId = $token->getModuleId();
    4141      $viewer = $token->getViewerId();
  • OpenPNE3/plugins/opOpenSocialPlugin/trunk/lib/form/MemberApplicationForm.class.php

    r10130 r10616  
    3131
    3232    $this->widgetSchema->setLabels(array(
    33       'is_disp_other' => '他のメンバーによる閲覧を許可する',
    34       'is_disp_home'  => 'ホーム/プロフィールに表示する',
     33      'is_disp_other' => 'Allow the SNS member accesses.',
     34      'is_disp_home'  => 'Add home and your profile.',
    3535    ));
    3636
  • OpenPNE3/plugins/opOpenSocialPlugin/trunk/lib/vendor/Shindig/config/container.js

    r10294 r10616  
    2727//              {"gadgets.container" : ["default"],
    2828//  to
    29 //              {"gadgets.container" : ["myContainer"],
     29//              ?{"gadgets.container" : ["myContainer"],
    3030// And make your changes that you need to myContainer.js.
    3131// Just make sure on the iframe URL you specify &container=myContainer
     
    7878// preloads in data pipelining.  %host% will be
    7979// substituted with the current host.
    80 "gadgets.osDataUri" : "http://%host%%webprefix%social/rpc",
     80"gadgets.osDataUri" : "http://%host%%webprefix%/social/rpc",
    8181
    8282// Uncomment these to switch to a secure version
     
    9494  "core.io" : {
    9595    // Note: /proxy is an open proxy. Be careful how you expose this!
    96     "proxyUrl" : "http://%host%%webprefix%gadgets/proxy?refresh=%refresh%&url=%url%",
    97     "jsonProxyUrl" : "http://%host%%webprefix%gadgets/makeRequest"
     96    "proxyUrl" : "http://%host%%webprefix%/gadgets/proxy?refresh=%refresh%&url=%url%",
     97    "jsonProxyUrl" : "http://%host%%webprefix%/gadgets/makeRequest"
    9898  },
    9999  "views" : {
     
    135135    // Must be on the same domain as the gadget rendering server
    136136    "impl" : "rpc",  //Use "rpc" to enable JSON-RPC, "rest' for REST
    137     "path" : "http://%host%%webprefix%social",
     137    "path" : "http://%host%%webprefix%/social",
    138138    "domain" : "shindig",
    139139    "enableCaja" : false,
  • OpenPNE3/plugins/opOpenSocialPlugin/trunk/web/css/opensocial.css

    r9575 r10616  
    1 .app_thumbnail
    2 {
     1.applicationScreenShot {
    32  overflow: hidden;
    4   float:    left;
    5   width:    120px;
    6   height:   60px;
     3  float: left;
     4  width: 280px;
    75}
    86
    9 .app_info
    10 {
    11   width:   60%;
    12   float:   left;
     7.applicationThumbnail {
     8  overflow: hidden;
     9  float: left;
     10  width: 120px;
     11  height: 60px;
     12}
     13
     14.applicationInfoBox .info {
     15  width: 60%;
     16  float: left;
    1317  padding: 0px 5px;
    1418}
    1519
    16 .app_option
    17 {
    18   width:         60px;
    19   float:         right;
    20   padding-right: 5px;
     20.applicationInfoBox .operation {
     21  width: 8.5em;
     22  float: right;
     23  padding: 0 5px 0 0;
    2124}
     25
     26.applicationInfoBox .operation ul li {
     27  background:transparent url(../../images/icon_arrow_1.gif) no-repeat scroll 0 0.4em;
     28  padding:2px 0 2px 20px;
     29}
     30
     31.applicationInfo div.moreInfo ul.moreInfo,
     32.applicationList div.moreInfo ul.moreInfo {
     33  margin: 0 5px 10px auto;
     34  width: 13em;
     35}
  • OpenPNE3/plugins/opOpenSocialPlugin/trunk/web/js/container.js

    r9776 r10616  
    5050                        if (web_prefix)
    5151                        {
    52                           url = web_prefix + 'prefs/set';
     52                          url = web_prefix + '/prefs/set';
    5353                        }
    5454                        new Ajax.Request(url, {method: 'get', parameters: { name: name, value: value, st: params.st }});
     
    6868                        return web_prefix;
    6969                } else if (view === 'profile') {
    70                         return web_prefix + 'member/' + person;
     70                        return web_prefix + '/member/' + person;
    7171                } else if (view === 'canvas') {
    72                         return web_prefix + 'application/canvas/id/' + mod;
     72                        return web_prefix + '/application/canvas/id/' + mod;
    7373                } else {
    7474                        return null;
Note: See TracChangeset for help on using the changeset viewer.