Commits

Crane Jin  committed 752d45a

Tuned page layout. Show side panel on blog page.

  • Participants
  • Parent commits 87fd183

Comments (0)

Files changed (8)

     "templates/tagcloud-en.html",
     "templates/rss.xml",
     "templates/rss-en.xml",
+    "templates/subscribers.html",
     "templates/words.html",
     "templates/wordslist.html",
     "templates/addwordform.html",

File static/styles/mysite.css

   margin-right: 10px;
 }
 
+.side-title {
+  background-color: #EEEEEE; 
+  padding-right:10px;
+  text-align:right;
+  border-radius: 2px; 
+  font-size: 16px;
+  font-weight: bold;
+  padding-top: 5px;
+  padding-bottom: 5px;
+  margin-top: 10px;
+ } 
+
 .header {
   background-color:#222222;
   border-radius: 4px 4px 4px 4px;
   margin-top:5px;
   margin-right:5px;
   min-height:50px;
-  background-color: #F5F5F5;
 }
 
 .rss-link {

File templates/about.html

 			<dl>
 				<dt>My open source</dt>
 				<dd><a target="_blank" href="https://bitbucket.org/cranej">Repositories @ bitbucket</a></dd>
+				<dd><a target="_blank" href="https://github.com/cranej">Repositories @ github</a></dd>
 			</dl>
         </div>
       </div>

File templates/blog-en.html

               <li>
 		{{end}}
             </ol>
+            <a name="leave-comment"></a>
             <div class="comment-form" id="comment-form">
               <h4>Leave a comment</h4>
               <form action="/en/blogs/{{.Slug}}/comments" method="post">
             </div>
           </div>
         </div>
+        <div class="span4">
+          <div class="side-title">
+            Common tasks
+          </div>
+          <div style="padding:10px;font-size:18px;">
+          <a href="#leave-comment">Leave a comment</a> 
+          </div>
+
+					<div class="side-title">Subscribers</div>	
+          {{template "subscribers"}}      
+        </div>
+
       </div>
     </div>
     <script type="text/javascript">

File templates/blog.html

               <li>
 		{{end}}
             </ol>
+            <a name="leave-comment"></a>
             <div class="comment-form" id="comment-form">
               <h4>Leave a comment</h4>
               <form action="/blogs/{{.Slug}}/comments" method="post">
             </div>
           </div>
         </div>
+        <div class="span4">
+          <div class="side-title">
+            Common tasks
+          </div>
+          <div style="padding:10px;font-size:18px;">
+          <a href="#leave-comment">Leave a comment</a> 
+          </div>
+
+					<div class="side-title">Subscribers</div>	
+          {{template "subscribers"}}      
+        </div>
       </div>
     </div>
     <script type="text/javascript">

File templates/blogs-en.html

           </div>
         </div>
         <div class="span4">
-          {{template "tagcloud-en" .TagCloud}}
-          <!-- <iframe src="http://www.pearsonlongman.com/ldocesearch-small.html" name="searching board" align="center" scrolling="no" frameborder="no" height = "90px" width = "180px"></iframe> -->
+          <div class="side-title">Tags</div>
+					{{template "tagcloud-en" .TagCloud}}
 
-          <h5>Subscribers:</h5>	
-          <ul>
-            <a class="rss-link" target="_blank" href="https://www.google.com/reader/view/feed/http://chunhe.info/blogs/feed" rel="nofollow" title="订阅到Google">
-              <img alt="订阅到Google" src="/images/rss/google.gif">
-            </a> 
-            <a  class="rss-link" target="_blank" href="http://www.zhuaxia.com/add_channel.php?url=http://chunhe.info/blogs/feed" rel="nofollow" title="订阅到抓虾">
-              <img alt="订阅到抓虾" src="/images/rss/zhuaxia.gif">
-            </a>
-            <a class="rss-link" target="_blank" href="http://www.xianguo.com/subscribe.php?url=http://chunhe.info/blogs/feed" rel="nofollow" title="订阅到鲜果">
-              <img alt="订阅到鲜果" src="/images/rss/xianguo.gif">
-            </a> 
-            <a class="rss-link" target="_blank" href="http://reader.youdao.com/#url=http://chunhe.info/blogs/feed" rel="nofollow" title="订阅到有道">
-              <img alt="订阅到有道" src="/images/rss/youdao.gif">
-            </a>
-            <a class="rss-link" target="_blank" href="http://inezha.com/add?url=http://chunhe.info/blogs/feed" rel="nofollow" title="哪吒订阅">
-              <img alt="哪吒订阅" src="/images/rss/msn.gif">
-            </a>
-          </ul>       
-        </div>
+					<div class="side-title">Subscribers</div>	
+          {{template "subscribers"}}  
+       </div>
       </div>
     </div>
     {{template "footer"}}

File templates/blogs.html

 					</div>
 				</div>
 				<div class="span4">
+          <div class="side-title">Tags</div>
 					{{template "tagcloud" .TagCloud}}
-					<!-- <iframe src="http://www.pearsonlongman.com/ldocesearch-small.html" name="searching board" align="center" scrolling="no" frameborder="no" height = "90px" width = "180px"></iframe> -->
 
-					<h5>Subscribers:</h5>	
-					<ul>
-						<a class="rss-link" target="_blank" href="https://www.google.com/reader/view/feed/http://chunhe.info/blogs/feed" rel="nofollow" title="订阅到Google">
-						<img alt="订阅到Google" src="/images/rss/google.gif">
-						</a> 
-						<a  class="rss-link" target="_blank" href="http://www.zhuaxia.com/add_channel.php?url=http://chunhe.info/blogs/feed" rel="nofollow" title="订阅到抓虾">
-						<img alt="订阅到抓虾" src="/images/rss/zhuaxia.gif">
-						</a>
-						<a class="rss-link" target="_blank" href="http://www.xianguo.com/subscribe.php?url=http://chunhe.info/blogs/feed" rel="nofollow" title="订阅到鲜果">
-						<img alt="订阅到鲜果" src="/images/rss/xianguo.gif">
-						</a> 
-						<a class="rss-link" target="_blank" href="http://reader.youdao.com/#url=http://chunhe.info/blogs/feed" rel="nofollow" title="订阅到有道">
-						<img alt="订阅到有道" src="/images/rss/youdao.gif">
-						</a>
-						<a class="rss-link" target="_blank" href="http://inezha.com/add?url=http://chunhe.info/blogs/feed" rel="nofollow" title="哪吒订阅">
-						<img alt="哪吒订阅" src="/images/rss/msn.gif">
-						</a>
-					</ul>       
+					<div class="side-title">Subscribers</div>	
+          {{template "subscribers"}}      
 				</div>
 			</div>
 		</div>

File templates/subscribers.html

+{{define "subscribers"}}
+<ul>
+  <a class="rss-link" target="_blank" href="https://www.google.com/reader/view/feed/http://chunhe.info/blogs/feed" rel="nofollow" title="订阅到Google">
+    <img alt="订阅到Google" src="/images/rss/google.gif">
+  </a> 
+  <a  class="rss-link" target="_blank" href="http://www.zhuaxia.com/add_channel.php?url=http://chunhe.info/blogs/feed" rel="nofollow" title="订阅到抓虾">
+    <img alt="订阅到抓虾" src="/images/rss/zhuaxia.gif">
+  </a>
+  <a class="rss-link" target="_blank" href="http://www.xianguo.com/subscribe.php?url=http://chunhe.info/blogs/feed" rel="nofollow" title="订阅到鲜果">
+    <img alt="订阅到鲜果" src="/images/rss/xianguo.gif">
+  </a> 
+  <a class="rss-link" target="_blank" href="http://reader.youdao.com/#url=http://chunhe.info/blogs/feed" rel="nofollow" title="订阅到有道">
+    <img alt="订阅到有道" src="/images/rss/youdao.gif">
+  </a>
+  <a class="rss-link" target="_blank" href="http://inezha.com/add?url=http://chunhe.info/blogs/feed" rel="nofollow" title="哪吒订阅">
+    <img alt="哪吒订阅" src="/images/rss/msn.gif">
+  </a>
+</ul> 
+{{end}}