修改主页

templates/org/course_list.tmpl

@@ -128,8 +128,14 @@
                         <!-- <img class="ui avatar" style="width: 22px;height:22px;display:flex;vertical-align: middle;" src="{{.Creator.RelAvatarLink}}"> -->
                         <div class="left aligned author">
                         <!-- <span > -->
-                            <img class="ui avatar image" style="width: 22px;height:22px;" src="{{.Creator.RelAvatarLink}}"> 
-                             {{$.i18n.Tr "org.repo_updated"}}&nbsp;: &nbsp; {{TimeSinceUnixShort .UpdatedUnix}}
+                            <!-- {{.Creator}} -->
+                            {{if .Creator}}
+                                <img class="ui avatar image" style="width: 22px;height:22px;margin-top:-2px"  src="{{.Creator.RelAvatarLink}}"> 
+                            {{else}}
+                                <img class="ui avatar image" style="width: 22px;height:22px;margin-top:-2px"  src="{{.Owner.RelAvatarLink}}"> 
+                            {{end}}
+
+                            {{$.i18n.Tr "org.repo_updated"}}&nbsp;: &nbsp; {{TimeSinceUnixShort .UpdatedUnix}}
                         <!-- </span> -->
                         </div>
                     </div>

templates/org/header.tmpl

@@ -25,3 +25,4 @@
 	</div>
 </div>
 
+

templates/org/home_courses.tmpl

@@ -1,7 +1,9 @@
 <style>
+
 	.organization-info_1000{
 		background: #F5F5F6 !important;
-
+		padding-top: 30px;
+		margin-bottom: 0px !important;
 	}
 	.organization-info >.container {
 		overflow: auto;
@@ -35,7 +37,7 @@
 		color:#FFFFFF !important;
 	}
 	.course{
-		padding: 10px 15px !important;
+		padding:10px 0 15px !important;
 	}
 	.course_color{
 		color: #FA8C16;
@@ -74,6 +76,9 @@
    .omit{
         overflow: hidden; white-space: nowrap; text-overflow: ellipsis;
     }
+	.noborder{
+		border: none !important;
+	}
 </style>
 {{template "base/head" .}}
 <div class="organization profile">
@@ -113,28 +118,11 @@
 					{{if .Org.Website}}<div class="item">{{svg "octicon-link" 16}} <a target="_blank" rel="noopener noreferrer" href="{{.Org.Website}}">{{.Org.Website}}</a></div>{{end}}
 				</div>
 			</div>
-		</div>
-		<div class="ui tabs container">
-			<div class="ui tabular stackable menu navbar">
-				{{with .Org}}
-					<a class="{{if $.PageIsOrgHome}}active{{end}} item " href="{{.HomeLink}}">
-						{{svg "octicon-home" 16}}&nbsp;{{$.i18n.Tr "org.home"}}
-					</a>
-				{{end}}
-				<a class="{{if $.PageIsOrgMembers}}active{{end}} item" href="{{$.OrgLink}}/members">
-					{{svg "octicon-organization" 16}}&nbsp;{{$.i18n.Tr "org.people"}}
-				</a>
-				{{if or ($.IsOrganizationMember) ($.IsOrganizationOwner)}}
-					<a class="{{if $.PageIsOrgTeams}}active{{end}} item" href="{{$.OrgLink}}/teams">
-						{{svg "octicon-jersey" 16}}&nbsp;{{$.i18n.Tr "org.teams"}}
-					</a>
-				{{end}}
-				{{if .IsOrganizationOwner}}<a class="right text grey item" href="{{.OrgLink}}/settings">{{svg "octicon-gear" 16}} &nbsp;组织设置</a>{{end}}
-			</div>
+		</div>		
+	</div>
+		{{template "org/navber_course" .}}
 
-		</div>
 
-	</div>
 		<!-- <div class="ui  container " style="overflow: auto">
 			<img class="ui left  image" id="org-avatar" src="{{.Org.SizedRelAvatarLink 140}}"/>
 			<p id="org-info">
@@ -197,7 +185,7 @@
 
 					<div class="ui sixteen wide mobile six wide tablet five wide computer column">
 
-						<h4 class="ui top attached header">
+						<h4 class="ui top attached header noborder">
 							<strong>{{.i18n.Tr "org.selected_couse"}}</strong>
 							<div class="ui right">
 								<a class="text grey"  id="model" onclick="showcreate()">{{svg "octicon-gear" 16}}</a>
@@ -207,7 +195,7 @@
 							<!-- {{end}} -->
 						</h4>
                
-						<div class="ui attached table segment course items">
+						<div class="ui attached table segment course items noborder">
                             {{ range .tags}}
                                 {{if eq .TagName "精选项目"}}
                                
@@ -232,7 +220,7 @@
 						</div>
 
 						
-						<h4 class="ui top attached header">
+						<h4 class="ui top attached header noborder">
 							<strong>{{.i18n.Tr "org.people"}}</strong>
 							<div class="ui right">
 								<a class="text grey" href="{{.OrgLink}}/members">{{.MembersTotal}} {{svg "octicon-chevron-right" 16}}</a>
@@ -241,7 +229,7 @@
 								
 							<!-- {{end}} -->
 						</h4>
-						<div class="ui attached segment members">
+						<div class="ui attached segment members noborder">
 							{{$isMember := .IsOrganizationMember}}
 							{{range .Members}}
 								{{if or $isMember (.IsPublicMember $.Org.ID)}}
@@ -255,13 +243,13 @@
 						</div>
 
 						{{if .IsOrganizationMember}}
-							<div class="ui top attached header">
+							<div class="ui top attached header noborder">
 								<strong>{{.i18n.Tr "org.teams"}}</strong>
 								<div class="ui right">
 									<a class="text grey" href="{{.OrgLink}}/teams"><span>{{.Org.NumTeams}}</span> {{svg "octicon-chevron-right" 16}}</a>
 								</div>
 							</div>
-							<div class="ui attached table segment teams">
+							<div class="ui attached table segment teams noborder">
 								{{range .Teams}}
 									<div class="item">
 										<a href="{{$.OrgLink}}/teams/{{.LowerName}}"><strong class="team-name">{{.Name}}</strong></a>
@@ -273,7 +261,7 @@
 								{{end}}
 							</div>
 							{{if .IsOrganizationOwner}}
-								<div class="ui bottom attached segment">
+								<div class="ui bottom attached segment noborder">
 									<a class="ui blue small button" href="{{.OrgLink}}/teams/new">{{.i18n.Tr "org.create_new_team"}}</a>
 								</div>
 							{{end}}

templates/org/member/course_members.tmpl

@@ -1,9 +1,16 @@
+<style>
+    .organization-header{
+        margin-bottom: 0px !important;
+        border-bottom:none !important
+    }
+</style>
+
 {{template "base/head" .}}
 <div class="organization members">
 	{{template "org/header" .}}
+	{{template "org/navber_course" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
-		{{template "org/navber" .}}
 		<div class="ui stackable grid">
 		
 			
@@ -67,6 +74,27 @@
 					</div>
 				{{end}}
 			</div>
+
+			<!-- <div class="ui three cards" style="margin-bottom: 10px;">
+				{{ range .Members}}
+				
+					<div class="card" >
+						<div class="image">
+							<img src="/images/avatar2/large/kristy.png">
+						  </div>
+						  <div class="content">
+							<a class="header">Kristy</a>
+							<div class="meta">
+							  <span class="date">Joined in 2013</span>
+							</div>
+							<div class="description">
+							  Kristy is an art director living in New York.
+							</div>
+						</div>
+					</div>
+				{{end}}
+
+			</div> -->
 			
 			{{template "base/paginate" .}}
 		</div>

templates/org/navber_course.tmpl

@@ -0,0 +1,28 @@
+<style>
+    .navber_course{
+		background: #F5F5F6 !important;
+		padding-top: 30px;
+		margin-bottom: 20px;
+	}
+</style>
+<div class="navber_course">
+    <div class="ui tabs container">
+        <div class="ui tabular stackable menu navbar">
+            {{with .Org}}
+                <a class="{{if $.PageIsOrgHome}}active{{end}} item " href="{{.HomeLink}}">
+                    {{svg "octicon-home" 16}}&nbsp;{{$.i18n.Tr "org.home"}}
+                </a>
+            {{end}}
+            <a class="{{if $.PageIsOrgMembers}}active{{end}} item" href="{{$.OrgLink}}/members">
+                {{svg "octicon-organization" 16}}&nbsp;{{$.i18n.Tr "org.people"}}
+            </a>
+            {{if or ($.IsOrganizationMember) ($.IsOrganizationOwner)}}
+                <a class="{{if $.PageIsOrgTeams}}active{{end}} item" href="{{$.OrgLink}}/teams">
+                    {{svg "octicon-jersey" 16}}&nbsp;{{$.i18n.Tr "org.teams"}}
+                </a>
+            {{end}}
+            {{if .IsOrganizationOwner}}<a class="right text grey item" href="{{.OrgLink}}/settings">{{svg "octicon-gear" 16}} &nbsp;组织设置</a>{{end}}
+        </div>
+
+    </div>
+</div>

templates/org/team/courseTeams.tmpl

@@ -1,9 +1,17 @@
+<style>
+    .organization-header{
+        margin-bottom: 0px !important;
+        border-bottom:none !important
+    }
+</style>
 {{template "base/head" .}}
 <div class="organization teams">
 	{{template "org/header" .}}
+	{{template "org/navber_course" .}}
+
 	<div class="ui container">
 		{{template "base/alert" .}}
-		{{template "org/navber" .}}
+
 		<div class="ui stackable grid">