Changeset 20339

Timestamp:

10/01/08 08:02:29 (3 months ago)

Author:

anatoo

Message:

テンプレート周りいじった

Location:

events/phpframework/plain_php/trunk

Files:

• core/RssRenderer.php (modified) (1 diff)
• default.php (added)
• index.php (modified) (1 diff)
• init.php (modified) (1 diff)
• resource/acount_create.php (modified) (1 diff)
• resource/css/style.css (modified) (3 diffs)
• resource/followings.php (modified) (1 diff)
• resource/img/share/reply_icon.gif (modified) (previous)
• resource/js/jquery.js (added)
• resource/public_timeline.php (modified) (1 diff)
• resource/settings.php (modified) (1 diff)
• resource/statuses.php (modified) (2 diffs)
• resource/timeline.php (modified) (3 diffs)
• resource/user.php (modified) (5 diffs)
• resource/user_followings.php (modified) (1 diff)

events/phpframework/plain_php/trunk/core/RssRenderer.php

@@ -5 +5 @@
     function render(RssResponse $r)
     {
-        header('Content-type: text/xml; charset=UTF-8');
+        header('Content-type: application/rss+xml; charset=UTF-8');
         
         list($title, $link, $desc) = $r->getChannel();

events/phpframework/plain_php/trunk/index.php

@@ -2 +2 @@
 include_once dirname(__FILE__) . '/init.php';
 
-$c = new ApplicationContext(dirname(__FILE__), 'http://localhost/phwittr', 
-                            dirname(__FILE__) . '/resource', 'http://localhost/phwittr/resource',
-                            'localhost',
-                            '/phwittr');
-ObjectBuilder::setApplicationContext($c);
+
 $response = ref(new PhwittrFront)->process(new Request('UTF-8'), $c, new RendererBuilder($c));
 /* TODO 例外handlerをつける */

events/phpframework/plain_php/trunk/init.php

@@ -8 +8 @@
     set_include_path(get_include_path() . PATH_SEPARATOR . $p);
 
+include_once dirname(__FILE__) . '/default.php';
 include_once dirname(__FILE__) . '/core/function.php';    
+include_once dirname(__FILE__) . '/model/mail/mail.php';
 
 
+$c = new ApplicationContext(dirname(__FILE__), 'http://localhost/phwittr', 
+                            dirname(__FILE__) . '/resource', 'http://localhost/phwittr/resource',
+                            'localhost',
+                            '/phwittr');
+ObjectBuilder::setApplicationContext($c);
+
+mb_language('japanese');
+mb_internal_encoding(Pool::getInstance()->fetchConfig()->encoding);

events/phpframework/plain_php/trunk/resource/acount_create.php

@@ -36 +36 @@
 
 <h2>登録完了しました</h2>
-<p><?php echo $email ?>にメールを送信したのでそこに書かれているURLにアクセスしてください。</p>
+<p><?php echo $email ?>にメールを送信しました。</p>
 
 <!-- / #main --></div>

events/phpframework/plain_php/trunk/resource/css/style.css

@@ -198 +198 @@
     margin-left: 4px;
     border: 1px solid #cccccc;
+    font-size: 80%;
 }
 
@@ -308 +309 @@
 }
 
-#people .button {
+a.button {
     color: #666;
     background-color: #eeeeee;
@@ -315 +316 @@
     font-size: 70%;
 }
-#people .button:hover {
+a.button:hover {
     text-decoration: none;
 }

events/phpframework/plain_php/trunk/resource/followings.php

@@ -44 +44 @@
     <td><a href="<?php echo $c->baseUrl . '/' . $user['user_name']; ?>"><?php echo $user['user_name'] ?></a><br/>
 
-        <a class="button" href="<?php echo "{$c->baseUrl}/friendships/delete/{$user['user_id']}/{$session->token}" ?>">remove</a>
+        <a class="button" href="<?php echo "{$c->baseUrl}/friendships/destroy/{$user['user_id']}/{$session->token}" ?>">remove</a>
 
     </td>

events/phpframework/plain_php/trunk/resource/public_timeline.php

@@ -9 +9 @@
     <base href="<?php echo $c->templateBaseUrl ?>/" />
     <link rel="shortcut icon" href="./img/share/favicon.ico" />
+    <link rel="alternate" type="application/rss+xml" title="RSS" href="<?php echo $c->baseUrl ?>/public_timeline/rss" />
 
     <!-- *** stylesheet *** -->

events/phpframework/plain_php/trunk/resource/settings.php

@@ -57 +57 @@
                 <?php if ($user['private_flag']) echo 'checked="checked" ' ?>/> 
             <label for="private_flag">つぶやきを非公開にする</label>
-            <?php if ($user['private_flag']): ?>
-                <a href="/public_timeline"><br/>公開中</a>
+            <?php if (!$user['private_flag']): ?>
+                <br/><a href="/public_timeline">公開中</a>
             <?php endif ?></td>
       </tr><tr>

events/phpframework/plain_php/trunk/resource/statuses.php

@@ -14 +14 @@
     
     <!-- *** javascript *** -->
-
+    <script src="./js/jquery.js" type="text/javascript"></script>
+    <script type="text/javascript">
+    $(document).ready(function () {
+       $(".delete_link").click(function (){
+            return confirm("Sure you want to delete this update? There is NO undo!");
+        });
+    });
+    </script>
 </head>
 
@@ -38 +45 @@
     <?php if ($is_logined): ?>
         <?php if($session->user_id === $status['user_id']): ?>
-            <a href="<?php echo "{$c->baseUrl}/status/delete/{$status['id']}/{$session->token}" ?>"><img src="./img/share/trash_icon.gif" /></a>
+            <a class="delete_link" href="<?php echo "{$c->baseUrl}/status/delete/{$status['id']}/{$session->token}" ?>"><img src="./img/share/trash_icon.gif" /></a>
         <?php else: ?>
             <a href="<?php echo "{$c->baseUrl}/home?status=@{$status['user_name']}" ?>"><img src="./img/share/reply_icon.gif" /></a>

events/phpframework/plain_php/trunk/resource/timeline.php

@@ -9 +9 @@
     <base href="<?php echo $c->templateBaseUrl ?>/" />
     <link rel="shortcut icon" href="./img/share/favicon.ico" />
-
+    <?php if ($current_action === 'public_timeline'): ?>
+    <link rel="alternate" type="application/rss+xml" title="RSS" href="<?php echo $c->baseUrl ?>/public_timeline/rss" />
+    <?php endif ?>
     <!-- *** stylesheet *** -->
     <link href="./css/import.css" rel="stylesheet" type="text/css" media="all" />
     
     <!-- *** javascript *** -->
-
+    <script src="./js/jquery.js" type="text/javascript"></script>
+    <script type="text/javascript">
+    $(document).ready(function() {
+        var textcount = $("#js_textcount");
+        var comment = $("#comment");
+        var baseurl = "<?php echo $c->baseUrl ?>";
+        var resourceurl = "<?php echo $c->templateBaseUrl ?>";
+        var url = baseurl + "/status/update/ajax";
+        var token = $("#token")[0].value;
+        var reload = function() {
+            textcount.text(140 - comment[0].value.length);
+        };
+        var bind_delete_action = function () {
+            $(".delete_link").click(function (){
+                return confirm("Sure you want to delete this update? There is NO undo!");
+            });
+        };
+        reload();
+        comment.bind("keyup", reload);
+        $("#post_form").submit(function() {
+            if (comment[0].value.length <= 0 || 140 - comment[0].value.length < 0) {
+                return false;
+            }
+            $.post(url, {token: token, comment: comment[0].value}, function(data) {
+                if (data.success) {
+                    comment[0].value = "";
+                    reload();
+                    var st = data.status;
+                    var cont = "";
+                    cont += "<tr><td><a href=\"" + baseurl + "/" + st.user_name + "\">";
+                    cont += "<img src=\"./img/" + (st.image ? "user/" + st.user_name : "friend") + "_icon.png\" /></a></td>";
+                    cont += "<td class=\"status_body\"><a href=\"" + baseurl + "/" + st.user_name + "\">" + st.user_name + "</a> " + st.comment;
+                    cont += " <span class=\"meta\"><a class=\"published\" href=\"" + baseurl + "/statuses/" + st.id + "\">" + st.created_at + "</a></span>" + "</td>";
+                    cont += "<td><a class=\"delete_link\" href=\"" + baseurl + "/status/delete/" + st.id + "/" + token + "\">";
+                    cont += "<img src=\"img/share/trash_icon.gif\" alt=\"Delete\" /></a></td></tr>";
+                    cont = $(cont);
+                    cont.hide();
+                    $("#timeline table.autopagerize_page_element").prepend(cont);
+                    cont.fadeIn("normal");
+                    
+                    bind_delete_action();
+                }
+            }, "json");
+            return false;
+        });
+        bind_delete_action();
+    });
+    </script>
 </head>
 
@@ -39 +88 @@
 <?php endforeach ?>
 
-<form action="<?php echo $c->baseUrl; ?>/status/update" method="post">
+<form action="<?php echo $c->baseUrl; ?>/status/update" method="post" id="post_form">
 <div id="post">
 <h2>What are you doing?</h2>
 <span class="textCount" id="js_textcount">140</span>
 <textarea id="comment" name="comment"><?php if ($status) echo h($status) . ' ' ?></textarea>
-<input type="hidden" name="token" value="<?php echo $session->token ?>" />
+<input type="hidden" id="token" name="token" value="<?php echo $session->token ?>" />
 <p id="button_space">
 <input type="submit" id="twit_button" value=" update " />
@@ -76 +125 @@
     <td>
         <?php if($status['user_name'] === $user_name): ?>
-        <a href="<?php echo $c->baseUrl ?>/status/delete/<?php echo $status['id'] . '/' . $session->token ?>">
-            <img src="img/share/trash_icon.gif" alt="Delete" class="icon16" /></a>
+        <a class="delete_link" href="<?php echo $c->baseUrl ?>/status/delete/<?php echo $status['id'] . '/' . $session->token ?>">
+            <img src="img/share/trash_icon.gif" alt="Delete" /></a>
         <?php else: ?>
             <a href="<?php echo "{$c->baseUrl}/home?status=@{$status['user_name']}" ?>"><img src="./img/share/reply_icon.gif" /></a>

events/phpframework/plain_php/trunk/resource/user.php

@@ -9 +9 @@
     <base href="<?php echo $c->templateBaseUrl ?>/" />
     <link rel="shortcut icon" href="./img/share/favicon.ico" />
+    <link rel="alternate" type="application/rss+xml" title="RSS" href="<?php echo $c->baseUrl ?>/<?php echo $user['user_name'] ?>/rss" />
 
+    
     <!-- *** stylesheet *** -->
     <link href="./css/import.css" rel="stylesheet" type="text/css" media="all" />
     
     <!-- *** javascript *** -->
-
+    <script src="./js/jquery.js" type="text/javascript"></script>
+    <script type="text/javascript">
+    $(document).ready(function () {
+       $(".delete_link").click(function (){
+            return confirm("Sure you want to delete this update? There is NO undo!");
+        });
+    });
+    </script>
 </head>
 
@@ -37 +46 @@
 
 
+<?php if (!$user['private_flag'] || $is_logined && $is_following): ?>
+
+<?php if ($is_logined): ?>
+
+    <?php if (!$is_self && $is_following): ?>
+    <a class="button" href="<?php echo "{$c->baseUrl}/friendships/destroy/{$user['id']}/{$session->token}" ?>">remove</a>
+    <?php elseif (!$is_self && !$is_following): ?>
+    <a class="button" href="<?php echo "{$c->baseUrl}/friendships/create/{$user['id']}/{$session->token}" ?>">follow</a>
+    <?php endif ?>
+    
+    <?php if ($is_requesting_self): ?>
+    <a class="button" href="<?php echo "{$c->baseUrl}/friend_requests/accept/{$user['id']}/{$session->token}" ?>">accept</a>
+    <a class="button" href="<?php echo "{$c->baseUrl}/friend_requests/deny/{$user['id']}/{$session->token}" ?>">deny</a>
+    <?php endif ?>
+
+<?php endif ?>
+
 <div id="timeline" class="autopagerize_page_element">
 <table>
@@ -50 +76 @@
     <td>
         <?php if($session && $status['user_name'] === $session->user_name): ?>
-        <a href="<?php echo $c->baseUrl ?>/status/delete/<?php echo $status['id'] . '/' . $session->token ?>">
+        <a class="delete_link" href="<?php echo $c->baseUrl ?>/status/delete/<?php echo $status['id'] . '/' . $session->token ?>">
             <img src="img/share/trash_icon.gif" alt="Delete" class="icon16" /></a>
         <?php elseif ($session): ?>
@@ -60 +86 @@
 </table>
 </div>
+
+
+
+<?php else: ?>
+<h3>このユーザーはプライベートです。</h3>
+<?php if (!$is_self): ?>
+
+
+<?php if ($is_requesting): ?>
+フォローできるようにリクエスト中です。
+<?php elseif (!$is_following): ?>
+<a class="button" href="<?php echo "{$c->baseUrl}/friendships/create/{$user['id']}/{$session->token}" ?>">
+<?php if ($user['private_flag']) echo 'send request'; else echo 'remove' ?></a>
+
+<?php endif ?>
+
+<?php if ($is_requesting_self): ?>
+<a class="button" href="<?php echo "{$c->baseUrl}/friend_requests/accept/{$user['id']}/{$session->token}" ?>">accept</a>
+<a class="button" href="<?php echo "{$c->baseUrl}/friend_requests/deny/{$user['id']}/{$session->token}" ?>">deny</a>
+<?php endif ?>
+
+<?php endif ?>
+
+<?php endif ?>
 
 <?php if ($page > 0 || $page_limit * ($page + 1) < $status_count): ?>
@@ -82 +132 @@
 </p>
 
-<?php if ($latest_status): ?>
+<?php if ($latest_status && (!$user['private_flag'] || $is_logined && $is_following)): ?>
 <h3>最近のつぶやき</h3>
 <p><?php echo $latest_status['comment']; ?></p>

events/phpframework/plain_php/trunk/resource/user_followings.php

@@ -44 +44 @@
     <td><a href="<?php echo $c->baseUrl . '/' . $user['user_name']; ?>"><?php echo $user['user_name'] ?></a><br/>
 
+        <?php if ($user_name === $session->user_name): ?>
         <a class="button" href="<?php echo "{$c->baseUrl}/friendships/delete/{$user['user_id']}/{$session->token}" ?>">remove</a>
-
+        <?php endif ?>
     </td>
     </tr>