Changeset 20038

Timestamp:

09/27/08 16:08:15 (5 years ago)

Author:

anatoo

Message:

テンプレ追加

Location:

events/phpframework/plain_php/trunk/resource

Files:

• acount_create.php (modified) (1 diff)
• activate.php (added)
• css/module.css (modified) (5 diffs)
• css/style.css (modified) (9 diffs)
• default_guide.php (modified) (1 diff)
• followers.php (added)
• followings.php (added)
• img/friend_icon_mini.png (added)
• img/share/reply_icon.gif (modified) (previous)
• img/user (added)
• index.php (modified) (1 diff)
• login.php (modified) (1 diff)
• logined_guide.php (modified) (1 diff)
• password.php (added)
• picture.php (added)
• public_timeline.php (added)
• sessions.php (modified) (1 diff)
• settings.php (added)
• signup.php (modified) (1 diff)
• statuses.php (added)
• timeline.php (moved) (moved from events/phpframework/plain_php/trunk/resource/home.php) (8 diffs)
• user.php (added)
• user_followers.php (added)
• user_followings.php (added)

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

@@ -30 +30 @@
 <div id="contents">
 
-<div id="wrapper">
+<div class="wrapper">
 <div id="main">
 

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

@@ -14 +14 @@
     padding-top: 10px;
     font-size: 90%;
-    border-top: 2px solid #333;
-}
-
-#page { 
-    background-color: #EBEAE2;
 }
 
 h2, h3 {
         font-size: 110%;
+}
+
+h2 img {
+        vertical-align: middle;
 }
 
@@ -44 +43 @@
 }
 
-.warning {
-    color: #ff3333;     
-}
-
 input {
         padding: 4px 3px;
@@ -53 +48 @@
 }
 
-input[type=text], input[type=password] {
+input[type=text], input[type=password],input[type=file]  {
         border: 1px solid #999999;
 }
 
-input[type=text]:focus , input[type=password]:focus {
+input[type=text]:focus, input[type=password]:focus, input[type=file]:focus {
         border: 1px solid #ffcc00;
 }
 
-
+table {
+        margin-bottom: 15px;
+}
 
 input[type=submit] {
@@ -95 +92 @@
 /* コンテンツ */
 
-#contents {
+.wrapper {
     padding-top: 10px;
     background-image: url(../img/share/up_arrow.gif);
     background-repeat: no-repeat;
     background-position: 20px 0px;
+    width: 542px;
+}
+
+.wrapper, #sub {
+    float: left;
 }
 
 #main, #sub {
-    float: left;
     margin-bottom: 10px;
     padding: 10px;
 }
 
-#main {
-    width: 522px;
-}
-
-#main h2 {
+.wrapper h2 {
         margin-bottom: 10px;
 }
 
+p.message {
+    margin: 4px 0;
+}
+
+p.warning {
+    margin: 4px 0;
+    color: #f33;
+}
+    
 #sub {
+        
+        margin-top: 10px;
     margin-left: 8px;
     width: 218px;
@@ -131 +139 @@
     padding: 2px 0px;
     margin-bottom: 8px;
+    font-size: 100%;
 }
 

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

@@ -1 +1 @@
 @charset "utf-8";
 
-#index #login_form {
+#login_form {
         margin-bottom: 10px;
 }
 
-#index #login_form p {
+#login_form p {
         margin: 2px 0px;
 }
 
-#login_page #login_table, #main1_page #login_table {
+#form_table, #login_table {
         margin:0px 0px 0px 60px;
 }
 
-#login_page #login_table td, #login_page #login_table th, #main1_page #login_table td{
+#sub_page #form_table {
+    margin: 0px;        
+}
+
+#form_table td, #form_table th{
     padding: 5px;
 }
 
-#main1_page #main, #main1_page #sub {
-    float: left;
+#main1_page .wrapper, #main1_page #sub {
     margin-bottom: 10px;
-    padding: 10px;
-}
-
-#main1_page #main {
-    width: 770px;
+}
+
+#main1_page .wrapper {
+    width: 790px;
+    padding: 10px 0px;
 }
 
@@ -33 +36 @@
     border: 0px;
     background-color: #f9f6f6;
-}
-
-#main1_page #login_table td{
+    padding: 10px;
+}
+
+#login_table td{
         vertical-align: top;
+        padding: 5px;
 }
 
@@ -62 +67 @@
     right:5px;
 }
-#post textarea.message{
+#post textarea#comment{
     width: 510px;
     height: 3em;
@@ -82 +87 @@
 
 ul.tabNav{
-        margin:0px 10px 10px; 
+        margin:0px 10px 9px; 
+        padding: 0px;
 }
 
@@ -89 +95 @@
         margin-left:-1px;
         margin-bottom:3px; 
-        font-size: 90%;
+
+        margin-top: 9px;
 }
 
@@ -99 +106 @@
     background-color:#FFFFFF;
     color:#333333;
-    padding:5px 10px;
+    padding:5px 9px;
 }
 
@@ -121 +128 @@
 }
 
-div#timeline table {
+#user_page #timeline {
+        border-top-width:0px;
+}
+
+div#public_timeline {
+}
+
+form#setting_form {
+    clear:both;
+    margin-top:-1px;
+    border-top:1px solid #999999;
+    padding:30px 0px 10px;
+}
+
+div#timeline table, div#public_timeline table {
         width: 100%;
         border-top: 1px solid #dddddd;
 }
 
-div#timeline table td {
+div#timeline table td, div#public_timeline table td {
     padding: 13px 6px;
     border-bottom: 1px solid #dddddd;
 }
 
-div#timeline table td.status_body {
+div#timeline table td.status_body, div#public_timeline table td.status_body {
     padding: 13px 5px;
 }
 
-div#timeline table tr:hover{
+div#timeline table tr:hover, div#public_timeline table tr:hover {
     background-color: #f9f9f9;
 }
 
-div#timeline table tr:hover td.status_body span.meta a.published{
+div#timeline table tr:hover td.status_body span.meta a.published, 
+div#public_timeline table tr:hover td.status_body span.meta a.published{
     color: #ff7171;
 }
 
-div#timeline table td.status_body span.meta {
+div#timeline table td.status_body span.meta, div#public_timeline table td.status_body span.meta {
     color: #999999;
     font-size: 80%;
@@ -150 +172 @@
 }
 
-div#timeline table td.status_body span.meta a.published {
+div#timeline table td.status_body span.meta a.published, 
+div#public_timeline table td.status_body span.meta a.published {
         color: #999999;
 }
@@ -176 +199 @@
     border: 1px solid #cccccc;
 }
+
+ul#settings_navi {
+    border-bottom: 1px solid #cccccc;
+    padding: 0 0 0 30px;
+}
+
+ul#settings_navi li {
+    display: inline;
+    padding: 0;
+    margin: 0 4px;
+}
+
+ul#settings_navi a {
+        padding: 3px 4px;
+        border: 1px solid #cccccc;
+        border-bottom-width: 0px;
+}
+
+ul#settings_navi .on {
+    display: inline;
+    background-color: #666;
+    color: #fff;
+}
+
+#sub_page #contents {
+    padding-top: 10px;
+    background-image: url(../img/share/up_arrow.gif);
+    background-repeat: no-repeat;
+    background-position: 20px 0px;
+    width: 790px;
+}
+
+#sub_page .wrapper {
+        padding: 0;
+        background-image: none;
+    background-color: #F3F0F0;
+        float:left;
+        width: 100%;
+}
+
+#sub_page #main {
+        float: left;
+        margin:0;
+        width: 531px;
+        border-right: 1px solid #E1DDDD;
+}
+
+#sub_page #sub {
+        float: left;
+    margin: 0;
+    height: 100%;
+    border-width: 0px;
+}
+
+
+
+#status_page .wrapper {
+    width: 600px;
+}
+
+#status_page #main {
+    padding: 17px;
+}
+
+#status_page #main #user img {
+        vertical-align: middle;
+        margin-right: 7px;
+}
+
+#status_page #main #user a {
+    font-size: 150%;
+}
+
+#status_page h2 {
+    font-size: 180%;
+    font-weight: normal;
+    font-family: 'Georgia', 'Serif';
+    margin: 0px 0px;
+    padding: 0px 0px;
+}
+
+#status_page div#status {
+        border-bottom: 1px solid #dddddd;
+        margin-bottom: 17px;
+        padding-bottom: 10px;
+}
+
+#status_page #meta {
+    color: #bbbbbb;
+    font-size: 120%;
+    font-style: italic;
+    font-family: 'Georgia', 'Serif';
+}
+
+#people {
+        width: 100%;
+}
+
+#people th {
+    padding-right: 10px;
+    width: 48px;
+}
+
+#people th, #people td {
+    padding-top: 8px;
+    padding-bottom: 8px;
+    border-bottom: 1px solid #dddddd;
+}
+
+#people .button {
+    color: #666;
+    background-color: #eeeeee;
+    border: 1px solid #ccc;
+    padding: 2px 3px;
+    font-size: 70%;
+}
+#people .button:hover {
+    text-decoration: none;
+}

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

@@ -1 +1 @@
     <ul id="guideNav">
+        <li><a href="<?php echo $c->baseUrl; ?>/public_timeline">タイムライン</a></li>
         <li><a href="<?php echo $c->baseUrl; ?>/login">ログイン</a></li>
         <li><a href="<?php echo $c->baseUrl; ?>/signup">ユーザー登録</a></li>

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

@@ -29 +29 @@
 <div id="contents">
 
-<div id="wrapper">
+<div class="wrapper">
 <div id="main">
 <h2>Phwittrとは？</h2>

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

@@ -30 +30 @@
 <div id="contents">
 
-<div id="wrapper">
+
+
+<div class="wrapper">
 <div id="main">
 <h2>ログイン</h2>
+
 <?php if ($r->existsMessage()) foreach ($r->getMessages() as $m): ?>
-<p class="warning"><?php echo $m ?></p>
+    <?php foreach ($r->getMessages() as $m): ?>
+    <p class="warning"><?php echo $m ?></p>
+    <?php endforeach ?>
 <?php endforeach ?>
+
 <form action="<?php echo $c->baseUrl; ?>/sessions" method="post">
     <table id="login_table"><tr>

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

@@ -2 +2 @@
         <li><a href="<?php echo $c->baseUrl; ?>/home">ホーム</a></li>
         <li><a href="<?php echo $c->baseUrl; ?>/<?php echo $user_name; ?>">プロフィール</a></li>
-        <li><a href="<?php echo $c->baseUrl; ?>/settings">設定</a></li>
+        <li><a href="<?php echo $c->baseUrl; ?>/acount/settings">設定</a></li>
         <li><a href="<?php echo $c->baseUrl; ?>/logout/<?php echo $session->token ?>">ログアウト</a></li>
     </ul>

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

@@ -30 +30 @@
 <div id="contents">
 
+
+
 <div id="wrapper">
 <div id="main">
 <h2>ログイン</h2>
-<?php if ($r->existsMessage()) foreach ($r->getMessages() as $e_msg) { ?>
-<p class="warning"><?php echo $e_msg; ?></p>
-<?php } ?>
+
+<?php if ($r->existsMessage()) foreach ($r->getMessages() as $m): ?>
+    <?php foreach ($r->getMessages() as $m): ?>
+    <p class="warning"><?php echo $m ?></p>
+    <?php endforeach ?>
+<?php endforeach ?>
 
 <form action="<?php echo $c->baseUrl; ?>/sessions" method="post">

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

@@ -30 +30 @@
 <div id="contents">
 
-<div id="wrapper">
+<div class="wrapper">
 <div id="main">
 

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

@@ -29 +29 @@
 <div id="contents">
 
-<div id="wrapper">
+
+<div class="wrapper">
 <div id="main">
+
+<?php if ($r->existsMessage()) foreach ($r->getMessages() as $m): ?>
+    <?php foreach ($r->getMessages() as $m): ?>
+    <p class="message"><?php echo $m ?></p>
+    <?php endforeach ?>
+<?php endforeach ?>
 
 <form action="<?php echo $c->baseUrl; ?>/status/update" method="post">
@@ -36 +43 @@
 <h2>What are you doing?</h2>
 <span class="textCount" id="js_textcount">140</span>
-<textarea class="message" name="comment"><?php echo h($status) ?></textarea>
+<textarea id="comment" name="comment"><?php if ($status) echo h($status) . ' ' ?></textarea>
 <input type="hidden" name="token" value="<?php echo $session->token ?>" />
 <p id="button_space">
-<input type="submit" id="twit_button" value=" つぶやく " />
+<input type="submit" id="twit_button" value=" update " />
 </p>
 </div>
@@ -47 +54 @@
 <li><a href="<?php echo $c->baseUrl; ?>/home"<?php if ($current_action === 'home'):?> class="on"<?php endif ?>>タイムライン</a></li>
 <li><a href="<?php echo $c->baseUrl; ?>/replies"<?php if ($current_action === 'replies'):?> class="on"<?php endif ?>>返信</a></li>
-<li><a href="<?php echo $c->baseUrl; ?>/<?php echo $user_name; ?>">過去発言</a></li>
+<li><a href="<?php echo $c->baseUrl; ?>/<?php echo $user_name; ?>">アーカイブ</a></li>
 <li><a href="<?php echo $c->baseUrl; ?>/public_timeline"<?php if ($current_action === 'public_timeline'):?> class="on"<?php endif ?>>公開タイムライン</a></li>
 </ul>
 
 <div id="timeline">
-<table>
+<table class="autopagerize_page_element">
 <?php foreach ($statuses as $status): ?>
   <tr>
     <td>
-        <img src="<?php if ($user['image']) echo $user['image']; else echo './img/friend_icon.png'; ?>" 
-         alt="<?php echo $user_name; ?>" />
+    <a href="<?php echo $c->baseUrl . '/' . $status['user_name']; ?>"><img src="<?php echo $c->templateBaseUrl . ($status['image'] ?  "/img/user/{$status['user_name']}_icon" : '/img/friend_icon') ?>.png" 
+         alt="<?php echo $status['user_name'] ?>" /></a>
     </td>
     <td class="status_body">
@@ -63 +70 @@
         <?php echo $status['comment'] ?>
         <span class="meta">
-            <a href="<?php echo $c->baseUrl . '/' . $status['user_name'] . '/statuses/' . $status['id']; ?>" class="published">
+            <a href="<?php echo "{$c->baseUrl}/statuses/{$status['id']}" ?>" class="published">
                 <?php echo $status['created_at']; ?></a>
         </span>    
@@ -71 +78 @@
         <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>
+        <?php else: ?>
+            <a href="<?php echo "{$c->baseUrl}/home?status=@{$status['user_name']}" ?>"><img src="./img/share/reply_icon.gif" /></a>
         <?php endif; ?>
     </td>
@@ -80 +89 @@
 <div id="buttom_navi">
 <?php if ($page > 0): ?>
-<a href="<?php echo $c->baseUrl . '/' . $current_action . '?page=' . (string)($page - 1); ?>" rel="next">&#171; Newer</a>
+<a href="<?php echo $c->baseUrl . '/' . $current_action . '?page=' . (string)($page - 1); ?>" rel="prev">&#171; Newer</a>
 <?php endif; ?>
 
 <?php if ($page_limit * ($page + 1) < $status_count): ?>
-<a href="<?php echo $c->baseUrl . '/' . $current_action . '?page=' . (string)($page + 1); ?>" rel="prev">Older &#187;</a>
+<a href="<?php echo $c->baseUrl . '/' . $current_action . '?page=' . (string)($page + 1); ?>" rel="next">Older &#187;</a>
 <?php endif; ?>
 </div>
@@ -95 +104 @@
 <h3>プロフィール</h3>
 <p>
-<img src="<?php if ($user['image']) echo $user['image']; else echo './img/friend_icon.png'; ?>" 
-         alt="<?php echo $user_name; ?>" width="32" height="32" />
+<a href="<?php echo "{$c->baseUrl}/{$user_name}" ?>"><img src="<?php echo $c->templateBaseUrl . ($user['image'] ?  "/img/user/{$user_name}_icon" : '/img/friend_icon') ?>.png" 
+         alt="<?php echo $user_name; ?>" width="32" height="32" /></a>
 <?php echo $user_name; ?>
 </p>
@@ -107 +116 @@
 <h3>ステータス</h3>
 <table id="status"><tr>
-<th><a href="<?php echo $c->baseUrl . '/' . $user_name; ?>/friends">followings</a></th><td><?php echo $following_count; ?></td>
+<th><a href="<?php echo $c->baseUrl ?>/friends">followings</a></th><td><?php echo $following_count; ?></td>
 </tr><tr>
-<th><a href="<?php echo $c->baseUrl . '/' . $user_name; ?>/followers">followers</a></th><td><?php echo $follower_count; ?></td>
+<th><a href="<?php echo $c->baseUrl ?>/followers">followers</a></th><td><?php echo $follower_count; ?></td>
 </tr><tr>
 <th><a href="<?php echo $c->baseUrl . '/' . $user_name; ?>">updates</a></th><td><?php echo $user_status_count; ?></td>
 </tr></table>
 
+<?php if (count($friends)): ?>
+<h3>あなたがフォロー</h3>
+    <p>
+    <?php foreach ($friends as $f): ?>
+        <a href="<?php echo $c->baseUrl . '/' . $f['user_name']; ?>">
+        <img src="<?php echo $c->templateBaseUrl . ($f['image'] ?  "/img/user/{$f['user_name']}_icon" : '/img/friend_icon') ?>_mini.png" 
+           alt="<?php echo $f['user_name'] ?>" /></a>
+    <?php endforeach ?>
+    <?php if ($view_all): ?><br/><a href="<?php echo $c->baseUrl ?>/friends">view all</a><?php endif ?>
+    </p>
+<?php endif ?>
 
 <!-- / #sub --></div>
 <!-- / #contents --></div>
+