Commit @3270a8c056956adcb0da3e01cae2663798b4c0c0

[Notice] Announcing the End of Demo Server [Read me]

Jihan Kim 2013-05-09

change view filename, adjust project logo size

change view filename(HIVE-211), adjust project logo size(HIVE-213)
remove unused files, fix filter markup on milestone list

@3270a8c056956adcb0da3e01cae2663798b4c0c0

71c0caa

3270a8c

app/assets/stylesheets/less/_mixins.less

--- app/assets/stylesheets/less/_mixins.less

+++ app/assets/stylesheets/less/_mixins.less


   -webkit-background-size: @param;
   -moz-background-size: @param;
   -o-background-size: @param;
-  background-size: @param;    
+  background-size: @param;
 }
 
 // Text overflow

     font-family: "HelveticaNeueLight", "HelveticaNeue-Light", "Helvetica Neue Light", "HelveticaNeue", "Helvetica Neue", "Helvetica";
     font-weight:200;
     font-stretch:normal;
-}
+}

71c0caa

3270a8c

app/views/project/delete.scala.html

--- app/views/project/delete.scala.html

+++ app/views/project/delete.scala.html

...	...	@@ -44,4 +44,4 @@
44	44	$hive.loadModule("project.Delete");
45	45	});
46	46	</script>
47		-}
	47	+} (No newline at end of file)

71c0caa

3270a8c

app/views/project/list.scala.html

--- app/views/project/list.scala.html

+++ app/views/project/list.scala.html


 
 @home(message, utils.MenuType.PROJECTS) {
 <div class="page">
-  
+
 	<div class="header-wrap">
 		<div class="stats-wrap">
 			@for(state <- Array("all", "public", "private")) {

 			<div id="search" class="inner">
 				<form action="@routes.ProjectApp.projects()" method="get">
 					<input name="state" type="hidden" value="@listState">
-					<input name="filter" class="text" type="text" placeholder="@Messages("site.project.filter")" value="@filter"><!-- 
-				 --><button type="submit" class="btn search-btn">@Messages("issue.search")</button><!-- 
+					<input name="filter" class="text" type="text" placeholder="@Messages("site.project.filter")" value="@filter"><!--
+				 --><button type="submit" class="btn search-btn">@Messages("issue.search")</button><!--
 					<a href="#" class=tn-advanced"><i class="ico"></i>Advanced Search</a> -->
-                     
+
 					<div class="srch-advanced">
-	                 	<!-- TODO: fill this form -->
+				<!-- TODO: fill this form -->
 					</div>
 				</form>
              </div>
          </div>
 	</div>
-      
+
 	<ul class="all-projects">
       @for(project <- currentPage.getList) {
           <li class="project">
               <div class="info-wrap">
                   <div class="header">
                       <a href="@routes.UserApp.userInfo(project.owner)">@project.owner</a> / <a href="@routes.ProjectApp.project(project.owner, project.name)" class="project-name">@project.name</a>
-            		  @if(!project.share_option){ <i class="ico ico-lock"></i> }
+			  @if(!project.share_option){ <i class="ico ico-lock"></i> }
                       @for(tag <- project.tags) {
                       <span class="label label-info">@tag.name</span>
                       }

                   <div class="like">
                       <i class="ico ico-like"></i><span class="num">1</span>
                   </div>
-                  <i class="ico ico-activity low"></i><!-- 
+                  <i class="ico ico-activity low"></i><!--
                --><a href="@routes.UserApp.userInfo(project.owner)" class="avatar-wrap img-rounded">
 						<img src="@project.getOwnerByName(project.owner).avatarUrl" width="32" height="32">
 				  </a>

           </li>
 	  }
 	</ul>
-	
+
 	<!-- pagination.js will fill here. -->
 	<div id="pagination"></div>
 </div>

71c0caa

3270a8c

app/views/project/members.scala.html

--- app/views/project/members.scala.html

+++ app/views/project/members.scala.html

...	...	@@ -91,4 +91,4 @@
91	91	});
92	92	</script>
93	93
94		-}
	94	+} (No newline at end of file)

71c0caa

3270a8c

app/views/project/overview.scala.html

--- app/views/project/overview.scala.html

+++ app/views/project/overview.scala.html


 @import utils.JodaDateUtil._
 @import utils.TemplateHelper._
 @import models.enumeration._
-@import utils.AccessControl._
 
 @projectLogoImage = @{
 	defining(Attachment.findByContainer(project.asResource)) { files =>

 
     <div class="input-prepend project-hometop-wrap">
     	<div class="vcs-wrap pull-left">
-    		<span class="clone-label"><strong class="@project.vcs">@project.vcs</strong></span><!--
+    		<span class="clone-label"><strong class="@project.vcs">@project.vcs</strong></span><!-- 
     	 --><input id="repositoryURL" type="text" class="text repo-url" readonly="readonly" value="@CodeApp.getURL(project.owner, project.name)">
         </div>
         <div class="issue-wrap btn-group pull-right">
             <button class="btn" disabled="true">@Messages("menu.issue")</button>
             <a href="@routes.IssueApp.issues(project.owner, project.name, State.OPEN.state)" class="btn">
-                @Messages("issue.state.open") <strong class="num open">@Issue.countIssues(project.id, State.OPEN)</strong>
+                @Messages("issue.state.open") <strong class="num open">@Issue.countIssues(project.id, State.OPEN)</strong> 
             </a>
             <a href="@routes.IssueApp.issues(project.owner, project.name, State.CLOSED.state)" class="btn">
-                @Messages("issue.state.closed") <strong class="num">@Issue.countIssues(project.id, State.CLOSED)</strong>
+                @Messages("issue.state.closed") <strong class="num">@Issue.countIssues(project.id, State.CLOSED)</strong> 
             </a>
         </div>
     </div>

 					<a href="@userPageUrlOnHistory(history)" class="avatar-wrap pull-left" style="margin-right:15px;">
 						<img src="@userAvatarUrlOnHistory(history)" width="32" height="32">
 					</a>
-
 					<div class="activity-desc">
 						<p class="header-text" style="margin-bottom:5px;">
 							@Html(Messages("project.history.item",
 								makeHistoryWho(history),
-								makeHistoryWhat(history), 
+								makeHistoryWhat(history),
 								makeHistoryHow(history)
 							))
 						</p>

 		</div>
 	</div>
 	}
-	
+
     <div class="bubble-wrap dark-gray readme">
         @if(project.readme == null) {
             <p class="default">

 
 <script type="text/javascript">
 $(document).ready(function(){
-    $hive.loadModule("project.Home", {
-        "sURLProjectTags": "@routes.ProjectApp.tags(project.owner, project.name)",
-        "sURLTags"       : "@routes.TagApp.tags()",
-        "nProjectId"     : @project.id
-    });
+	$hive.loadModule("project.Home");
 });
 </script>
-}
+}

Add a comment

Open 0
Closed 0

List

...	...	@@ -96,7 +96,7 @@
96	96	-webkit-background-size: @param;
97	97	-moz-background-size: @param;
98	98	-o-background-size: @param;
99		- background-size: @param;
	99	+ background-size: @param;
100	100	}
101	101
102	102	// Text overflow
...	...	@@ -154,4 +154,4 @@
154	154	font-family: "HelveticaNeueLight", "HelveticaNeue-Light", "Helvetica Neue Light", "HelveticaNeue", "Helvetica Neue", "Helvetica";
155	155	font-weight:200;
156	156	font-stretch:normal;
157		-}
	157	+} (No newline at end of file)

...	...	@@ -3,7 +3,7 @@
3	3
4	4	@home(message, utils.MenuType.PROJECTS) {
5	5	<div class="page">
6		-
	6	+
7	7	<div class="header-wrap">
8	8	<div class="stats-wrap">
9	9	@for(state <- Array("all", "public", "private")) {
...	...	@@ -17,25 +17,25 @@
17	17	<div id="search" class="inner">
18	18	<form action="@routes.ProjectApp.projects()" method="get">
19	19	<input name="state" type="hidden" value="@listState">
20		- <input name="filter" class="text" type="text" placeholder="@Messages("site.project.filter")" value="@filter"><!--
21		- --><button type="submit" class="btn search-btn">@Messages("issue.search")</button><!--
	20	+ <input name="filter" class="text" type="text" placeholder="@Messages("site.project.filter")" value="@filter"><!--
	21	+ --><button type="submit" class="btn search-btn">@Messages("issue.search")</button><!--
22	22	<a href="#" class=tn-advanced"><i class="ico"></i>Advanced Search</a> -->
23		-
	23	+
24	24	<div class="srch-advanced">
25		- <!-- TODO: fill this form -->
	25	+ <!-- TODO: fill this form -->
26	26	</div>
27	27	</form>
28	28	</div>
29	29	</div>
30	30	</div>
31		-
	31	+
32	32	<ul class="all-projects">
33	33	@for(project <- currentPage.getList) {
34	34	<li class="project">
35	35	<div class="info-wrap">
36	36	<div class="header">
37	37	<a href="@routes.UserApp.userInfo(project.owner)">@project.owner</a> / <a href="@routes.ProjectApp.project(project.owner, project.name)" class="project-name">@project.name</a>
38		- @if(!project.share_option){ <i class="ico ico-lock"></i> }
	38	+ @if(!project.share_option){ <i class="ico ico-lock"></i> }
39	39	@for(tag <- project.tags) {
40	40	<span class="label label-info">@tag.name</span>
41	41	}
...	...	@@ -49,7 +49,7 @@
49	49	<div class="like">
50	50	<i class="ico ico-like"></i><span class="num">1</span>
51	51	</div>
52		- <i class="ico ico-activity low"></i><!--
	52	+ <i class="ico ico-activity low"></i><!--
53	53	--><a href="@routes.UserApp.userInfo(project.owner)" class="avatar-wrap img-rounded">
54	54	<img src="@project.getOwnerByName(project.owner).avatarUrl" width="32" height="32">
55	55	</a>
...	...	@@ -57,7 +57,7 @@
57	57	</li>
58	58	}
59	59	</ul>
60		-
	60	+
61	61	<!-- pagination.js will fill here. -->
62	62	<div id="pagination"></div>
63	63	</div>

...	...	@@ -3,7 +3,6 @@
3	3	@import utils.JodaDateUtil._
4	4	@import utils.TemplateHelper._
5	5	@import models.enumeration._
6		-@import utils.AccessControl._
7	6
8	7	@projectLogoImage = @{
9	8	defining(Attachment.findByContainer(project.asResource)) { files =>
...	...	@@ -38,16 +37,16 @@
38	37
39	38	<div class="input-prepend project-hometop-wrap">
40	39	<div class="vcs-wrap pull-left">
41		- <span class="clone-label"><strong class="@project.vcs">@project.vcs</strong></span><!--
	40	+ <span class="clone-label"><strong class="@project.vcs">@project.vcs</strong></span><!--
42	41	--><input id="repositoryURL" type="text" class="text repo-url" readonly="readonly" value="@CodeApp.getURL(project.owner, project.name)">
43	42	</div>
44	43	<div class="issue-wrap btn-group pull-right">
45	44	<button class="btn" disabled="true">@Messages("menu.issue")</button>
46	45	<a href="@routes.IssueApp.issues(project.owner, project.name, State.OPEN.state)" class="btn">
47		- @Messages("issue.state.open") <strong class="num open">@Issue.countIssues(project.id, State.OPEN)</strong>
	46	+ @Messages("issue.state.open") <strong class="num open">@Issue.countIssues(project.id, State.OPEN)</strong>
48	47	</a>
49	48	<a href="@routes.IssueApp.issues(project.owner, project.name, State.CLOSED.state)" class="btn">
50		- @Messages("issue.state.closed") <strong class="num">@Issue.countIssues(project.id, State.CLOSED)</strong>
	49	+ @Messages("issue.state.closed") <strong class="num">@Issue.countIssues(project.id, State.CLOSED)</strong>
51	50	</a>
52	51	</div>
53	52	</div>
...	...	@@ -99,12 +98,11 @@
99	98	<a href="@userPageUrlOnHistory(history)" class="avatar-wrap pull-left" style="margin-right:15px;">
100	99	<img src="@userAvatarUrlOnHistory(history)" width="32" height="32">
101	100	</a>
102		-
103	101	<div class="activity-desc">
104	102	<p class="header-text" style="margin-bottom:5px;">
105	103	@Html(Messages("project.history.item",
106	104	makeHistoryWho(history),
107		- makeHistoryWhat(history),
	105	+ makeHistoryWhat(history),
108	106	makeHistoryHow(history)
109	107	))
110	108	</p>
...	...	@@ -118,7 +116,7 @@
118	116	</div>
119	117	</div>
120	118	}
121		-
	119	+
122	120	<div class="bubble-wrap dark-gray readme">
123	121	@if(project.readme == null) {
124	122	<p class="default">
...	...	@@ -138,11 +136,7 @@
138	136
139	137	<script type="text/javascript">
140	138	$(document).ready(function(){
141		- $hive.loadModule("project.Home", {
142		- "sURLProjectTags": "@routes.ProjectApp.tags(project.owner, project.name)",
143		- "sURLTags" : "@routes.TagApp.tags()",
144		- "nProjectId" : @project.id
145		- });
	139	+ $hive.loadModule("project.Home");
146	140	});
147	141	</script>
148		-}
	142	+} (No newline at end of file)

Delete comment