Fix #348

5 files changed, 84 insertions, 51 deletions

diff --git a/templates/.VERSION b/templates/.VERSION
index 5f3c518191..6e361299ef 100644
--- a/templates/.VERSION
+++ b/templates/.VERSION
@@ -1 +1 @@
-0.4.9.0902 Beta
\ No newline at end of file
+0.4.9.0905 Beta
\ No newline at end of file
diff --git a/templates/explore/nav.tmpl b/templates/explore/nav.tmpl
new file mode 100644
index 0000000000..1310bccf04
--- /dev/null
+++ b/templates/explore/nav.tmpl
@@ -0,0 +1,8 @@
+<div id="setting-menu" class="grid-1-5 panel panel-radius left">
+    <p class="panel-header"><strong>{{.i18n.Tr "explore"}}</strong></p>
+    <div class="panel-body">
+        <ul class="menu menu-vertical switching-list grid-1-5 left">
+            <li {{if .PageIsExploreRepositories}}class="current"{{end}}><a href="/explore">{{.i18n.Tr "explore.repos"}}</a></li>
+        </ul>
+    </div>
+</div>
\ No newline at end of file
diff --git a/templates/explore/repos.tmpl b/templates/explore/repos.tmpl
new file mode 100644
index 0000000000..a1e3d408e8
--- /dev/null
+++ b/templates/explore/repos.tmpl
@@ -0,0 +1,25 @@
+{{template "ng/base/head" .}}
+{{template "ng/base/header" .}}
+<div id="setting-wrapper" class="main-wrapper">
+    <div id="org-setting" class="container clear">
+	    {{template "explore/nav" .}}
+        <div class="grid-4-5 left">
+            <div class="setting-content">
+            	<div id="org-repo-list">
+					{{range .Repos}}
+					<div class="org-repo-item">
+			            <ul class="org-repo-status right">
+			                <li><i class="octicon octicon-star"></i> {{.NumStars}}</li>
+			                <li><i class="octicon octicon-git-branch"></i> {{.NumForks}}</li>
+			            </ul>
+						<h2><a href="/{{.Owner.Name}}/{{.Name}}">{{.Name}}</a></h2>
+						<p class="org-repo-description">{{.Description}}</p>
+						<p class="org-repo-updated">{{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Updated $.i18n.Lang}}</p>
+					</div>
+					{{end}}
+            	</div>
+			</div>
+        </div>
+    </div>
+</div>
+{{template "ng/base/footer" .}}
\ No newline at end of file
diff --git a/templates/org/settings/options.tmpl b/templates/org/settings/options.tmpl
index ae225a9ca4..14ea1b349d 100644
--- a/templates/org/settings/options.tmpl
+++ b/templates/org/settings/options.tmpl
@@ -3,54 +3,54 @@
 {{template "org/base/header" .}}
 <div id="setting-wrapper" class="main-wrapper">
     <div id="org-setting" class="container clear">
-	        {{template "org/settings/nav" .}}
-	        <div class="grid-4-5 left">
-	            <div class="setting-content">
-	                {{template "ng/base/alert" .}}
-	                <div id="setting-content">
-	                    <div id="user-profile-setting-content" class="panel panel-radius">
-	                        <div class="panel-header">
-	                        	<strong>{{.i18n.Tr "org.settings.options"}}</strong>
-	                        </div>
-	                        <form class="form form-align panel-body" id="org-setting-form" action="/org/{{.Org.LowerName}}/settings" method="post">
-	                            {{.CsrfTokenHtml}}
-                    			<input type="hidden" name="action" value="update">
-	                            <div class="field">
-	                                <label class="req" for="orgname">{{.i18n.Tr "username"}}</label>
-	                                <input class="ipt ipt-large ipt-radius {{if .Err_UserName}}ipt-error{{end}}" id="orgname" name="uname" value="{{.Org.Name}}" data-orgname="{{.Org.Name}}" required />
-	                            </div>
-	                            <div class="field">
-	                                <label for="full-name">{{.i18n.Tr "org.settings.full_name"}}</label>
-	                                <input class="ipt ipt-large ipt-radius {{if .Err_FullName}}ipt-error{{end}}" id="full-name" name="fullname" value="{{.Org.FullName}}" />
-	                            </div>
-	                            <div class="field">
-	                                <label class="req" for="email">{{.i18n.Tr "email"}}</label>
-	                                <input class="ipt ipt-large ipt-radius {{if .Err_Email}}ipt-error{{end}}" id="email" name="email" type="email" value="{{.Org.Email}}" required />
-	                            </div>
-					            <div class="field clear">
-					                <label class="left" for="desc">{{.i18n.Tr "org.org_desc"}}</label>
-					                <textarea class="ipt ipt-large ipt-radius {{if .Err_Description}}ipt-error{{end}}" id="desc" name="desc">{{.Org.Description}}</textarea>
-					            </div>
-	                            <div class="field">
-	                                <label for="website">{{.i18n.Tr "org.settings.website"}}</label>
-	                                <input class="ipt ipt-large ipt-radius {{if .Err_Website}}ipt-error{{end}}" id="website" name="website" type="url" value="{{.Org.Website}}" />
-	                            </div>
-	                            <div class="field">
-	                                <label for="location">{{.i18n.Tr "org.settings.location"}}</label>
-	                                <input class="ipt ipt-large ipt-radius {{if .Err_Location}}ipt-error{{end}}" id="location" name="location" type="text" value="{{.Org.Location}}" />
-	                            </div>
-	                            <div class="field">
-	                                <label for="gravatar-email">Gravatar {{.i18n.Tr "email"}}</label>
-	                                <input class="ipt ipt-large ipt-radius {{if .Err_Avatar}}ipt-error{{end}}" id="gravatar-email" name="avatar" type="text" value="{{.Org.AvatarEmail}}" />
-	                            </div>
-	                            <div class="field">
-	                                <span class="form-label"></span>
-	                                <button class="btn btn-green btn-large btn-radius">{{.i18n.Tr "org.settings.update_settings"}}</button>
-	                            </div>
-	                        </form>
-	                    </div>
-	                </div>
-	            </div>
+        {{template "org/settings/nav" .}}
+        <div class="grid-4-5 left">
+            <div class="setting-content">
+                {{template "ng/base/alert" .}}
+                <div id="setting-content">
+                    <div id="user-profile-setting-content" class="panel panel-radius">
+                        <div class="panel-header">
+                        	<strong>{{.i18n.Tr "org.settings.options"}}</strong>
+                        </div>
+                        <form class="form form-align panel-body" id="org-setting-form" action="/org/{{.Org.LowerName}}/settings" method="post">
+                            {{.CsrfTokenHtml}}
+                			<input type="hidden" name="action" value="update">
+                            <div class="field">
+                                <label class="req" for="orgname">{{.i18n.Tr "username"}}</label>
+                                <input class="ipt ipt-large ipt-radius {{if .Err_UserName}}ipt-error{{end}}" id="orgname" name="uname" value="{{.Org.Name}}" data-orgname="{{.Org.Name}}" required />
+                            </div>
+                            <div class="field">
+                                <label for="full-name">{{.i18n.Tr "org.settings.full_name"}}</label>
+                                <input class="ipt ipt-large ipt-radius {{if .Err_FullName}}ipt-error{{end}}" id="full-name" name="fullname" value="{{.Org.FullName}}" />
+                            </div>
+                            <div class="field">
+                                <label class="req" for="email">{{.i18n.Tr "email"}}</label>
+                                <input class="ipt ipt-large ipt-radius {{if .Err_Email}}ipt-error{{end}}" id="email" name="email" type="email" value="{{.Org.Email}}" required />
+                            </div>
+				            <div class="field clear">
+				                <label class="left" for="desc">{{.i18n.Tr "org.org_desc"}}</label>
+				                <textarea class="ipt ipt-large ipt-radius {{if .Err_Description}}ipt-error{{end}}" id="desc" name="desc">{{.Org.Description}}</textarea>
+				            </div>
+                            <div class="field">
+                                <label for="website">{{.i18n.Tr "org.settings.website"}}</label>
+                                <input class="ipt ipt-large ipt-radius {{if .Err_Website}}ipt-error{{end}}" id="website" name="website" type="url" value="{{.Org.Website}}" />
+                            </div>
+                            <div class="field">
+                                <label for="location">{{.i18n.Tr "org.settings.location"}}</label>
+                                <input class="ipt ipt-large ipt-radius {{if .Err_Location}}ipt-error{{end}}" id="location" name="location" type="text" value="{{.Org.Location}}" />
+                            </div>
+                            <div class="field">
+                                <label for="gravatar-email">Gravatar {{.i18n.Tr "email"}}</label>
+                                <input class="ipt ipt-large ipt-radius {{if .Err_Avatar}}ipt-error{{end}}" id="gravatar-email" name="avatar" type="text" value="{{.Org.AvatarEmail}}" />
+                            </div>
+                            <div class="field">
+                                <span class="form-label"></span>
+                                <button class="btn btn-green btn-large btn-radius">{{.i18n.Tr "org.settings.update_settings"}}</button>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+            </div>
 	    </div>
 	</div>
 </div>
diff --git a/templates/status/404.tmpl b/templates/status/404.tmpl
index 2d04b55917..e024715ed2 100644
--- a/templates/status/404.tmpl
+++ b/templates/status/404.tmpl
@@ -1,11 +1,11 @@
 {{template "ng/base/head" .}}
 {{template "ng/base/header" .}}
-<div id="body" class="container text-center">
+<div class="container text-center">
     <p style="margin-top: 100px"><img src="/img/404.png" alt="404"/></p>
     <hr/>
     <br>
     <p>Application Version: {{AppVer}}</p>
     <p>If you think this is an error, please open an issue on <a href="https://github.com/gogits/gogs/issues/new">GitHub</a>.</p>
-    <h3>We're currently working on 0.5 beta version, many pages may be missing at this time. Sorry for confusion!</h3>
+    <!-- <p>We're currently working on 0.5 beta version, many pages may be missing at this time. Sorry for confusion!</p> -->
 </div>
 {{template "ng/base/footer" .}}