Changeset 23833 for events/phpframework
- Timestamp:
- 11/16/08 16:31:01 (8 weeks ago)
- Location:
- events/phpframework/zend_framework/trunk
- Files:
-
- 10 added
- 54 modified
-
README.txt (added)
-
app/configs/mail.ini (modified) (1 diff)
-
app/configs/setting.ini (modified) (1 diff)
-
app/layouts/comment.phtml (modified) (3 diffs)
-
app/layouts/default.phtml (modified) (5 diffs)
-
app/layouts/error.phtml (modified) (2 diffs)
-
app/layouts/follow.phtml (added)
-
app/layouts/footer.phtml (added)
-
app/layouts/login.phtml (modified) (5 diffs)
-
app/layouts/setting.phtml (modified) (3 diffs)
-
app/layouts/signin.phtml (modified) (4 diffs)
-
app/layouts/user.phtml (added)
-
app/layouts/userlogin.phtml (added)
-
app/modules/index/controllers/AccountController.php (modified) (2 diffs)
-
app/modules/index/controllers/FollowersController.php (modified) (2 diffs)
-
app/modules/index/controllers/FriendRequestsController.php (modified) (1 diff)
-
app/modules/index/controllers/FriendsController.php (modified) (1 diff)
-
app/modules/index/controllers/FriendshipsController.php (modified) (3 diffs)
-
app/modules/index/controllers/HomeController.php (modified) (1 diff)
-
app/modules/index/controllers/LoginController.php (modified) (1 diff)
-
app/modules/index/controllers/SidenaviController.php (modified) (1 diff)
-
app/modules/index/controllers/StatusesController.php (modified) (7 diffs)
-
app/modules/index/controllers/UserController.php (modified) (1 diff)
-
app/modules/index/services/Statuses.php (modified) (4 diffs)
-
app/modules/index/views/scripts/account/archive.phtml (modified) (1 diff)
-
app/modules/index/views/scripts/account/message.phtml (modified) (1 diff)
-
app/modules/index/views/scripts/account/password.phtml (modified) (2 diffs)
-
app/modules/index/views/scripts/account/picture.phtml (modified) (1 diff)
-
app/modules/index/views/scripts/account/register.phtml (modified) (2 diffs)
-
app/modules/index/views/scripts/account/setting.phtml (modified) (3 diffs)
-
app/modules/index/views/scripts/followers/index.phtml (modified) (2 diffs)
-
app/modules/index/views/scripts/friend-requests/decision.phtml (modified) (1 diff)
-
app/modules/index/views/scripts/friend-requests/index.phtml (modified) (1 diff)
-
app/modules/index/views/scripts/friends/index.phtml (modified) (1 diff)
-
app/modules/index/views/scripts/friendships/create.phtml (modified) (1 diff)
-
app/modules/index/views/scripts/home/comment.phtml (modified) (1 diff)
-
app/modules/index/views/scripts/home/index.phtml (modified) (1 diff)
-
app/modules/index/views/scripts/home/list.phtml (modified) (1 diff)
-
app/modules/index/views/scripts/index/index.phtml (modified) (1 diff)
-
app/modules/index/views/scripts/login/index.phtml (modified) (1 diff)
-
app/modules/index/views/scripts/public-timeline/index.phtml (modified) (2 diffs)
-
app/modules/index/views/scripts/public-timeline/list.phtml (added)
-
app/modules/index/views/scripts/replies/index.phtml (modified) (1 diff)
-
app/modules/index/views/scripts/sidenavi/home.phtml (modified) (1 diff)
-
app/modules/index/views/scripts/sidenavi/index.phtml (modified) (1 diff)
-
app/modules/index/views/scripts/sidenavi/login.phtml (modified) (1 diff)
-
app/modules/index/views/scripts/signup/index.phtml (modified) (1 diff)
-
app/modules/index/views/scripts/user/comment.phtml (modified) (1 diff)
-
app/modules/index/views/scripts/user/index.phtml (modified) (3 diffs)
-
app/modules/index/views/scripts/user/list.phtml (added)
-
library/Phwittr/Controller/Action/Abstract.php (modified) (4 diffs)
-
library/Phwittr/Pager.php (modified) (1 diff)
-
library/Phwittr/View/Helper/BaseUrl.php (added)
-
library/Phwittr/View/Helper/UserLink.php (modified) (3 diffs)
-
var/images/default.png (modified) (previous)
-
www/css/default.css (modified) (1 diff)
-
www/css/module.css (modified) (1 diff)
-
www/css/style.css (modified) (1 diff)
-
www/img/friend_icon.png (modified) (previous)
-
www/img/friend_icon_mini.png (added)
-
www/img/share/phwittr_logo.gif (modified) (previous)
-
www/img/share/reply_icon.gif (modified) (previous)
-
www/img/share/up_arrow.gif (modified) (previous)
-
www/js/jquery.js (added)
Legend:
- Unmodified
- Added
- Removed
-
events/phpframework/zend_framework/trunk/app/configs/mail.ini
r21268 r23833 6 6 smtp.username = "" 7 7 smtp.password = "" 8 mail.from = " "8 mail.from = "phwittr" -
events/phpframework/zend_framework/trunk/app/configs/setting.ini
r21267 r23833 47 47 routes.account.defaults.key = "" 48 48 49 ;; Delete status 50 routes.delete.route = "statuses/destroy/:statuses_id/:token" 51 routes.delete.defaults.module = "index" 52 routes.delete.defaults.controller = "statuses" 53 routes.delete.defaults.action = "destroy" 54 routes.delete.defaults.statuses_id = "" 55 routes.delete.defaults.token = "" 56 49 57 ;; http://example.com/home 50 58 routes.home.route = "/home" -
events/phpframework/zend_framework/trunk/app/layouts/comment.phtml
r15709 r23833 2 2 <html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja" dir="ltr"> 3 3 <head> 4 <meta http-equiv="content-type" content="text/html; charset=utf-8" /> 5 <title>Phwittr</title> 6 <meta http-equiv="content-style-type" content="text/css" /> 7 <meta http-equiv="content-script-type" content="text/javascript" /> 8 <meta name="keywords" content="phwittr,phwitter,phitter,phittr,php,twitter" /> 9 <meta name="description" content="PHPのZend Frameworkで作成されたTwitterクローンです" /> 10 <link rev="made" href="mailto:heavenshell.jp@gmail.com" /> 11 <link rel="index" href="/" /> 12 <link rel="shortcut icon" href="/img/share/favicon.ico" /> 13 <!-- *** feed *** --> 14 <link rel="alternate" href="/feed/index.xml" type="application/rss+xml" title="RSS 2.0" /> 15 <!-- *** stylesheet *** --> 16 <link href="/css/import.css" rel="stylesheet" type="text/css" media="all" /> 17 <!-- *** javascript *** --> 18 <script src="http://www.google.com/jsapi" type="text/javascript"></script> 19 <script type="text/javascript">google.load("jquery", "1.2");</script> 4 <meta http-equiv="content-type" content="text/html; charset=utf-8" /> 5 <title>Phwittr</title> 6 <meta http-equiv="content-style-type" content="text/css" /> 7 <meta http-equiv="content-script-type" content="text/javascript" /> 8 9 <base href="" /> 10 <link rel="shortcut icon" href="/img/share/favicon.ico" /> 11 <!-- *** stylesheet *** --> 12 <link href="/css/import.css" rel="stylesheet" type="text/css" media="all" /> 13 14 <!-- *** javascript *** --> 15 <script src="/js/jquery.js" type="text/javascript"></script> 16 <script type="text/javascript"></script> 17 20 18 </head> 21 <body id="yourDomainName" class="indexBody"> 19 20 <body id="status_page"> 22 21 <div id="page"> 23 22 <div id="header"> … … 26 25 <div id="contents"> 27 26 <!-- #wrapper --> 28 <div id="wrapper">27 <div class="wrapper"> 29 28 <!-- #main --> 30 29 <div id="main"> … … 32 31 </div> 33 32 <!-- / #main --> 33 </div> 34 34 </div> 35 35 </div> 36 </div>37 36 </body> 38 37 </html> -
events/phpframework/zend_framework/trunk/app/layouts/default.phtml
r15709 r23833 2 2 <html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja" dir="ltr"> 3 3 <head> 4 <meta http-equiv="content-type" content="text/html; charset=utf-8" /> 5 <title>Phwittr</title> 6 <meta http-equiv="content-style-type" content="text/css" /> 7 <meta http-equiv="content-script-type" content="text/javascript" /> 8 <meta name="keywords" content="phwittr,phwitter,phitter,phittr,php,twitter" /> 9 <meta name="description" content="PHPのZend Frameworkで作成されたTwitterクローンです" /> 10 <link rev="made" href="mailto:heavenshell.jp@gmail.com" /> 11 <link rel="index" href="/" /> 12 <link rel="shortcut icon" href="/img/share/favicon.ico" /> 13 <!-- *** feed *** --> 14 <link rel="alternate" href="/feed/index.xml" type="application/rss+xml" title="RSS 2.0" /> 15 <!-- *** stylesheet *** --> 16 <link href="/css/import.css" rel="stylesheet" type="text/css" media="all" /> 17 <!-- *** javascript *** --> 18 <script src="http://www.google.com/jsapi" type="text/javascript"></script> 19 <script type="text/javascript">google.load("jquery", "1.2");</script> 4 <meta http-equiv="content-type" content="text/html; charset=utf-8" /> 5 <title>Phwittr</title> 6 <meta http-equiv="content-style-type" content="text/css" /> 7 <meta http-equiv="content-script-type" content="text/javascript" /> 8 9 <base href="" /> 10 <link rel="shortcut icon" href="/img/share/favicon.ico" /> 11 <!-- *** stylesheet *** --> 12 <link href="/css/import.css" rel="stylesheet" type="text/css" media="all" /> 13 14 <!-- *** javascript *** --> 15 <script src="/js/jquery.js" type="text/javascript"></script> 16 <script type="text/javascript"></script> 17 20 18 </head> 21 <body id="yourDomainName" class="indexBody"> 19 20 <body id="index"> 22 21 <div id="page"> 23 22 <!-- #header --> … … 25 24 <h1><a href="/"><img src="/img/share/phwittr_logo.gif" alt="phwittr" /></a></h1> 26 25 <ul id="guideNav"> 26 <li><a href="/public-timeline">タイムライン</a></li> 27 27 <li><a href="/login">ログイン</a></li> 28 28 <li><a href="/signup">ユーザー登録</a></li> … … 32 32 <div id="contents"> 33 33 <!-- #wrapper --> 34 <div id="wrapper">34 <div class="wrapper"> 35 35 <!-- #main --> 36 36 <div id="main"> … … 41 41 <!-- / #wrapper --> 42 42 <!-- #sidenavi --> 43 <div id="sub"> 43 <div id="sub"> 44 44 <?php echo $this->layout()->login ?> 45 45 <?php echo $this->layout()->sidenavi ?> … … 49 49 <!-- #footer --> 50 50 <div id="footer"> 51 <p class="copy"> 52 <center> 53 ©2008 <a href="#">Heavens hell</a>. 54 template by <a href="http://d.hatena.ne.jp/ku-suke">id:ku-suke</a> 55 </center> 56 </p> 51 <?php echo $this->render('footer.phtml') ?> 57 52 </div> 58 53 <!-- / #footer --> -
events/phpframework/zend_framework/trunk/app/layouts/error.phtml
r15709 r23833 2 2 <html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja" dir="ltr"> 3 3 <head> 4 <meta http-equiv="content-type" content="text/html; charset=utf-8" /> 5 <title>Phwittr</title> 6 <meta http-equiv="content-style-type" content="text/css" /> 7 <meta http-equiv="content-script-type" content="text/javascript" /> 8 <meta name="keywords" content="phwittr,phwitter,phitter,phittr,php,twitter" /> 9 <meta name="description" content="PHPのZend Frameworkで作成されたTwitterクローンです" /> 10 <link rev="made" href="mailto:heavenshell.jp@gmail.com" /> 11 <link rel="index" href="/" /> 12 <link rel="shortcut icon" href="/img/share/favicon.ico" /> 13 <!-- *** feed *** --> 14 <link rel="alternate" href="/feed/index.xml" type="application/rss+xml" title="RSS 2.0" /> 15 <!-- *** stylesheet *** --> 16 <link href="/css/import.css" rel="stylesheet" type="text/css" media="all" /> 17 <!-- *** javascript *** --> 18 <script src="http://www.google.com/jsapi" type="text/javascript"></script> 19 <script type="text/javascript">google.load("jquery", "1.2");</script> 4 <meta http-equiv="content-type" content="text/html; charset=utf-8" /> 5 <title>Phwittr</title> 6 <meta http-equiv="content-style-type" content="text/css" /> 7 <meta http-equiv="content-script-type" content="text/javascript" /> 8 9 <base href="" /> 10 <link rel="shortcut icon" href="/img/share/favicon.ico" /> 11 <!-- *** stylesheet *** --> 12 <link href="/css/import.css" rel="stylesheet" type="text/css" media="all" /> 13 14 <!-- *** javascript *** --> 15 <script src="/js/jquery.js" type="text/javascript"></script> 20 16 </head> 21 <body id="yourDomainName" class="indexBody">17 <body> 22 18 <div id="page"> 23 19 <div id="header"> … … 36 32 <!-- #footer --> 37 33 <div id="footer"> 38 <p class="copy"> 39 <center> 40 ©2008 <a href="#">Heavens hell</a>. 41 template by <a href="http://d.hatena.ne.jp/ku-suke">id:ku-suke</a> 42 </center> 43 </p> 34 <?php echo $this->render('footer.phtml') ?> 44 35 </div> 45 36 <!-- / #footer --> -
events/phpframework/zend_framework/trunk/app/layouts/login.phtml
r15709 r23833 2 2 <html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja" dir="ltr"> 3 3 <head> 4 <meta http-equiv="content-type" content="text/html; charset=utf-8" /> 5 <title>Phwittr</title> 6 <meta http-equiv="content-style-type" content="text/css" /> 7 <meta http-equiv="content-script-type" content="text/javascript" /> 8 <meta name="keywords" content="phwittr,phwitter,phitter,phittr,php,twitter" /> 9 <meta name="description" content="PHPのZend Frameworkで作成されたTwitterクローンです" /> 10 <link rev="made" href="mailto:heavenshell.jp@gmail.com" /> 11 <link rel="index" href="/" /> 12 <link rel="shortcut icon" href="/img/share/favicon.ico" /> 13 <!-- *** feed *** --> 14 <link rel="alternate" href="/feed/index.xml" type="application/rss+xml" title="RSS 2.0" /> 15 <!-- *** stylesheet *** --> 16 <link href="/css/import.css" rel="stylesheet" type="text/css" media="all" /> 17 <!-- *** javascript *** --> 18 <script src="http://www.google.com/jsapi" type="text/javascript"></script> 19 <script type="text/javascript">google.load("jquery", "1.2");</script> 4 <meta http-equiv="content-type" content="text/html; charset=utf-8" /> 5 <title>Phwittr</title> 6 <meta http-equiv="content-style-type" content="text/css" /> 7 <meta http-equiv="content-script-type" content="text/javascript" /> 8 9 <base href="" /> 10 <link rel="shortcut icon" href="/img/share/favicon.ico" /> 11 <!-- *** stylesheet *** --> 12 <link href="/css/import.css" rel="stylesheet" type="text/css" media="all" /> 13 14 <!-- *** javascript *** --> 15 <script src="/js/jquery.js" type="text/javascript"></script> 16 <script type="text/javascript"></script> 17 20 18 </head> 21 <body id="yourDomainName" class="indexBody"> 19 20 <body id="index"> 22 21 <div id="page"> 23 22 <!-- #header --> … … 26 25 <ul id="guideNav"> 27 26 <li><a href="/home">ホーム</a></li> 27 <li><a href="/account/archive">プロフィール</a></li> 28 28 <li><a href="/account/setting">設定</a></li> 29 29 <li><a href="/logout">ログアウト</a></li> … … 33 33 <div id="contents"> 34 34 <!-- #wrapper --> 35 <div id="wrapper">35 <div class="wrapper"> 36 36 <!-- #main --> 37 37 <div id="main"> … … 42 42 <!-- / #wrapper --> 43 43 <!-- #sidenavi --> 44 <div id="sub"> 44 <div id="sub"> 45 45 <?php echo $this->layout()->login ?> 46 46 <?php echo $this->layout()->sidenavi ?> … … 50 50 <!-- #footer --> 51 51 <div id="footer"> 52 <p class="copy"> 53 <center> 54 ©2008 <a href="#">Heavens hell</a>. 55 template by <a href="http://d.hatena.ne.jp/ku-suke">id:ku-suke</a> 56 </center> 57 </p> 52 <?php echo $this->render('footer.phtml') ?> 58 53 </div> 59 54 <!-- / #footer --> -
events/phpframework/zend_framework/trunk/app/layouts/setting.phtml
r15709 r23833 2 2 <html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja" dir="ltr"> 3 3 <head> 4 <meta http-equiv="content-type" content="text/html; charset=utf-8" /> 5 <title>Phwittr</title> 6 <meta http-equiv="content-style-type" content="text/css" /> 7 <meta http-equiv="content-script-type" content="text/javascript" /> 8 <meta name="keywords" content="phwittr,phwitter,phitter,phittr,php,twitter" /> 9 <meta name="description" content="PHPのZend Frameworkで作成されたTwitterクローンです" /> 10 <link rev="made" href="mailto:heavenshell.jp@gmail.com" /> 11 <link rel="index" href="/" /> 12 <link rel="shortcut icon" href="/img/share/favicon.ico" /> 13 <!-- *** feed *** --> 14 <link rel="alternate" href="/feed/index.xml" type="application/rss+xml" title="RSS 2.0" /> 15 <!-- *** stylesheet *** --> 16 <link href="/css/import.css" rel="stylesheet" type="text/css" media="all" /> 17 <!-- *** javascript *** --> 18 <script src="http://www.google.com/jsapi" type="text/javascript"></script> 19 <script type="text/javascript"> 20 google.load("jquery", "1.2"); 21 </script> 4 <meta http-equiv="content-type" content="text/html; charset=utf-8" /> 5 <title>Phwittr</title> 6 <meta http-equiv="content-style-type" content="text/css" /> 7 <meta http-equiv="content-script-type" content="text/javascript" /> 8 9 <base href="" /> 10 <link rel="shortcut icon" href="/img/share/favicon.ico" /> 11 <!-- *** stylesheet *** --> 12 <link href="/css/import.css" rel="stylesheet" type="text/css" media="all" /> 13 <link rel="stylesheet" href="/js/jquery.jgrowl.css" type="text/css"/> 14 <!-- *** javascript *** --> 15 <script src="/js/jquery.js" type="text/javascript"></script> 16 <script type="text/javascript"> 17 $(document).ready(function() { 18 var message = $("#message").text(); 19 if (message != "") { 20 var timeout = setTimeout( 21 function(){ 22 $('#message').fadeOut(1000); 23 clearTimeout(timeout); 24 }, 25 5000); 26 } 27 }); 28 </script> 22 29 </head> 23 <body id=" yourDomainName" class="indexBody">30 <body id="sub_page"> 24 31 <div id="page"> 25 32 <!-- #header --> … … 35 42 <div id="contents"> 36 43 <!-- #wrapper --> 37 <div id="wrapper">44 <div class="wrapper"> 38 45 <!-- #main --> 39 <div id="main">40 46 <?php echo $this->layout()->content ?> 41 </div>42 47 <!-- / #main --> 43 48 </div> … … 46 51 <!-- #footer --> 47 52 <div id="footer"> 48 <p class="copy"> 49 <center> 50 ©2008 <a href="#">Heavens hell</a>. 51 template by <a href="http://d.hatena.ne.jp/ku-suke">id:ku-suke</a> 52 </center> 53 </p> 53 <?php echo $this->render('footer.phtml') ?> 54 54 </div> 55 55 <!-- / #footer --> -
events/phpframework/zend_framework/trunk/app/layouts/signin.phtml
r15709 r23833 2 2 <html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja" dir="ltr"> 3 3 <head> 4 <meta http-equiv="content-type" content="text/html; charset=utf-8" /> 5 <title>Phwittr</title> 6 <meta http-equiv="content-style-type" content="text/css" /> 7 <meta http-equiv="content-script-type" content="text/javascript" /> 8 <meta name="keywords" content="phwittr,phwitter,phitter,phittr,php,twitter" /> 9 <meta name="description" content="PHPのZend Frameworkで作成されたTwitterクローンです" /> 10 <link rev="made" href="mailto:heavenshell.jp@gmail.com" /> 11 <link rel="index" href="/" /> 12 <link rel="shortcut icon" href="/img/share/favicon.ico" /> 13 <!-- *** feed *** --> 14 <link rel="alternate" href="/feed/index.xml" type="application/rss+xml" title="RSS 2.0" /> 15 <!-- *** stylesheet *** --> 16 <link href="/css/import.css" rel="stylesheet" type="text/css" media="all" /> 17 <!-- *** javascript *** --> 18 <script src="http://www.google.com/jsapi" type="text/javascript"></script> 19 <script type="text/javascript"> 20 google.load("jquery", "1.2"); 21 </script> 4 <meta http-equiv="content-type" content="text/html; charset=utf-8" /> 5 <title>Phwittr</title> 6 <meta http-equiv="content-style-type" content="text/css" /> 7 <meta http-equiv="content-script-type" content="text/javascript" /> 8 9 <base href="" /> 10 <link rel="shortcut icon" href="/img/share/favicon.ico" /> 11 <!-- *** stylesheet *** --> 12 <link href="/css/import.css" rel="stylesheet" type="text/css" media="all" /> 13 14 <!-- *** javascript *** --> 15 <script src="/js/jquery.js" type="text/javascript"></script> 22 16 </head> 23 <body id=" yourDomainName" class="indexBody">17 <body id="main1_page"> 24 18 <div id="page"> 25 19 <!-- #header --> … … 27 21 <h1><a href="/"><img src="/img/share/phwittr_logo.gif" alt="phwittr" /></a></h1> 28 22 <ul id="guideNav"> 23 <li><a href="/public-timeline">タイムライン</a></li> 29 24 <li><a href="/login">ログイン</a></li> 30 25 <li><a href="/signup">ユーザー登録</a></li> … … 34 29 <div id="contents"> 35 30 <!-- #wrapper --> 36 <div id="wrapper">31 <div class="wrapper"> 37 32 <!-- #main --> 38 33 <div id="main"> … … 45 40 <!-- #footer --> 46 41 <div id="footer"> 47 <p class="copy"> 48 <center> 49 ©2008 <a href="#">Heavens hell</a>. 50 template by <a href="http://d.hatena.ne.jp/ku-suke">id:ku-suke</a> 51 </center> 52 </p> 42 <?php echo $this->render('footer.phtml') ?> 53 43 </div> 54 44 <!-- / #footer --> -
events/phpframework/zend_framework/trunk/app/modules/index/controllers/AccountController.php
r22876 r23833 351 351 } 352 352 353 $this->_helper->viewRenderer('message');354 353 $this->assign('message', '更新が完了しました。'); 355 354 } … … 428 427 } 429 428 430 $this->_helper->viewRenderer('message');431 429 $this->assign('message', '更新が完了しました。'); 432 430 } -
events/phpframework/zend_framework/trunk/app/modules/index/controllers/FollowersController.php
r22876 r23833 52 52 return; 53 53 } 54 $this->_helper->layout->setLayout(' setting');54 $this->_helper->layout->setLayout('follow'); 55 55 } 56 56 … … 73 73 public function indexAction() 74 74 { 75 $name = $this->_getParam('name', $this->_user->getUserInfo('user_name'));76 $users = $this->getService('Users')77 ->getUserInfoByName($name);75 $name = $this->_getParam('name', $this->_user->getUserInfo('user_name')); 76 $users = $this->getService('Users') 77 ->getUserInfoByName($name); 78 78 79 79 if ($users === null) { -
events/phpframework/zend_framework/trunk/app/modules/index/controllers/FriendRequestsController.php
r22876
![(please configure the [header_logo] section in trac.ini)](/share/chrome/site/your_project_logo.png)