merge update

maybeTomorrow · Apr 24, 2013 · 598aef5 · 598aef5
2 parents 017c1c5 + 613896d
commit 598aef5
Show file tree

Hide file tree

Showing 15 changed files with 1,767 additions and 203 deletions.
diff --git a/WebRoot/WEB-INF/classes/job_sql.xml b/WebRoot/WEB-INF/classes/job_sql.xml
@@ -1,5 +1,7 @@
 <sqlGroup name="job">
-
+<sql id="findOneById">
+select U.username authorname,J.*,R.views,R.comments from users U, job J left join job_record R on J.id=R.id where U.id=J.author and J.id= ?
+</sql>
     <sql id="findListForIndex">
         select J.*,R.views,R.comments from job J left join job_record R on J.id=R.id order by J.id asc limit 0,10
     </sql>

diff --git a/WebRoot/WEB-INF/views/admin/index.html b/WebRoot/WEB-INF/views/admin/index.html
@@ -1,51 +1,55 @@
-<#include "/layout/admin/_layout.html" /><@head title="四眼井-后台管理系统 "></@head><@body>
-<div class="ui-box">
-	<div class="ui-box-title">
-		<h3>xxx
-			<span style="">
-				（
-				<span id="J_module_myapp_count">
-					10
-				</span>）
-			</span>
-		</h3>
-		<a href="#" class="ui-box-title-more" title="管理我的应用">
-			More
-		</a>
-	</div>
-	<div class="ui-box-container ui-box-content">
-		<ul class="ui-article-list">
-			<li class="ui-article-item">
-				<a href="#">
-					LinkedIn 实时低延迟数据抓取系统 Databus 开源
-				</a>
-			</li>
-			<li class="ui-article-item">
-				<a href="#">
-					LinkedIn 实时低延迟数据抓取系统 Databus 开源
-				</a>
-			</li>
-			<li class="ui-article-item">
-				<a href="#">
-					LinkedIn 实时低延迟数据抓取系统 Databus 开源
-				</a>
-			</li>
-			<li class="ui-article-item">
-				<a href="#">
-					LinkedIn 实时低延迟数据抓取系统 Databus 开源
-				</a>
-			</li>
-			<li class="ui-article-item">
-				<a href="#">
-					LinkedIn 实时低延迟数据抓取系统 Databus 开源
-				</a>
-			</li>
-			<li class="ui-article-item">
-				<a href="#">
-					LinkedIn 实时低延迟数据抓取系统 Databus 开源
-				</a>
-			</li>
-		</ul>
-	</div>
-</div>
+<#include "/layout/admin/_layout.html" /><@head title="四眼井-后台管理系统 "></@head><@body>
+<div class="ui-box">
+	<div class="ui-box-title">
+		<h3>xxx
+			<span style="">
+				（
+				<span id="J_module_myapp_count">
+					10
+				</span>）
+			</span>
+		</h3>
+		<a href="#" class="ui-box-title-more" title="管理我的应用">
+			More
+		</a>
+	</div>
+	<div class="ui-box-container ui-box-content">
+		<ul class="ui-article-list">
+		<#if job??>
+		<#list job as job>
+			<li class="ui-article-item">
+				<a href="#">
+					${job.title}
+				</a>
+			</li>
+			</#list>
+			</#if>
+			<li class="ui-article-item">
+				<a href="#">
+					LinkedIn 实时低延迟数据抓取系统 Databus 开源
+				</a>
+			</li>
+			<li class="ui-article-item">
+				<a href="#">
+					LinkedIn 实时低延迟数据抓取系统 Databus 开源
+				</a>
+			</li>
+			<li class="ui-article-item">
+				<a href="#">
+					LinkedIn 实时低延迟数据抓取系统 Databus 开源
+				</a>
+			</li>
+			<li class="ui-article-item">
+				<a href="#">
+					LinkedIn 实时低延迟数据抓取系统 Databus 开源
+				</a>
+			</li>
+			<li class="ui-article-item">
+				<a href="#">
+					LinkedIn 实时低延迟数据抓取系统 Databus 开源
+				</a>
+			</li>
+		</ul>
+	</div>
+</div>
 </@body>
diff --git a/WebRoot/WEB-INF/views/job/add.html b/WebRoot/WEB-INF/views/job/add.html
@@ -1,6 +1,6 @@
 <#include "/layout/_layout.html" /> <@head title="首页|四眼井|互联网人的乐园 ">
-</@head> <@body> <#include "/layout/_nav.html" /><@nav 5/>
-<div class="container clearfix">
+</@head> <@body>
+<div class=" clearfix">
 	<div class="ui-grid-19">
 		<div class="mgl-20">
 			<div class="ui-box">
@@ -31,7 +31,27 @@
 								type="text" name="job.recruiting_numbers">
 						</div>
 						<div class="ui-form-item">
-							<label class="ui-label"><span class="lable">职位类别：</span></label></label> <select
+							<label class="ui-label"><span class="lable">学历要求:</span></label><select
+								class="ui-select" name="job.education">
+								<option value="0">无</option>
+								<option value="1">大专</option>
+								<option value="2">本科</option>
+								<option value="3">研究生</option>
+								<option value="4">硕士</option>
+								<option value="5">博士</option>
+								</select>
+						</div>
+							<div class="ui-form-item">
+							<label class="ui-label"><span class="lable">工作经验:</span></label><select
+								class="ui-select" name="job.experience">
+								<option value="0">无经验要求</option>
+								<option value="1">1~3年</option>
+								<option value="2">3~5年</option>
+								<option value="3">5~10年</option>
+								</select>
+						</div>
+						<div class="ui-form-item">
+							<label class="ui-label"><span class="lable">职位类别：</span></label><select
 								class="ui-select" name="job.type">
 								<option value="0">请选择职位类别:</option>
 								<option value="1">.NET程序员</option>