diff --git a/vendor/built_in_modules/archive/app/controllers/panel/archive/front_end/archive_files_controller.rb b/vendor/built_in_modules/archive/app/controllers/panel/archive/front_end/archive_files_controller.rb
index a0d1cc899..03ada60ff 100644
--- a/vendor/built_in_modules/archive/app/controllers/panel/archive/front_end/archive_files_controller.rb
+++ b/vendor/built_in_modules/archive/app/controllers/panel/archive/front_end/archive_files_controller.rb
@@ -1,4 +1,5 @@
 class Panel::Archive::FrontEnd::ArchiveFilesController < OrbitWidgetController
+  include AdminHelper
 
   def initialize
     super
@@ -30,27 +31,26 @@ class Panel::Archive::FrontEnd::ArchiveFilesController < OrbitWidgetController
     @archive_file_categorys = ArchiveFileCategory.all
     # @archive_files = ArchiveFile.where( :is_hidden => false ).desc(:is_top).page(params[:page]).per(@page_num)
 
-    if params[:search_query]
-      get_search_result
-      @archive_files = ArchiveFile.can_display.where(:archive_file_category_id.in => @archive_file_categorys.collect{|t| t.id}).desc( :is_top, :created_at ).page( params[:page_main] ).per(@page_num)
+    if !params[:category_id].blank? && !params[:tag_id].blank?
+      @archive_files = @archive_files.default_sort(params[:sort]).can_display.where(:archive_file_category_id.in => params[:category_id], :tagged_ids.in => params[:tag_id]).desc( :is_top ).page( params[:page_main] ).per(@page_num)
+
+        @current_category = ArchiveFileCategory.from_id(params[:category_id]) rescue nil
+
+    elsif !params[:category_id].blank?
+      @archive_files = ArchiveFile.default_sort(params[:sort]).can_display.where(:archive_file_category_id.in => params[:category_id]).desc( :is_top ).page( params[:page_main] ).per(@page_num)
+      @current_category = ArchiveFileCategory.from_id(params[:category_id]) rescue nil
+    elsif !params[:tag_id].blank?
+      @archive_files = ArchiveFile.default_sort(params[:sort]).can_display.where(:tagged_ids.in => params[:tag_id]).desc( :is_top ).page( params[:page_main] ).per(@page_num)
     else
-      if !params[:category_id].blank? && !params[:tag_id].blank?
-        @archive_files = @archive_files.can_display.where(:archive_file_category_id.in => params[:category_id], :tagged_ids.in => params[:tag_id]).desc( :is_top, :created_at ).page( params[:page_main] ).per(@page_num)
-
-        @current_category = ArchiveFileCategory.from_id(params[:category_id]) rescue nil
-
-      elsif !params[:category_id].blank?
-        @archive_files = ArchiveFile.can_display.where(:archive_file_category_id.in => params[:category_id]).desc( :is_top, :created_at ).page( params[:page_main] ).per(@page_num)
-        @current_category = ArchiveFileCategory.from_id(params[:category_id]) rescue nil
-      elsif !params[:tag_id].blank?
-        @archive_files = ArchiveFile.can_display.where(:tagged_ids.in => params[:tag_id]).desc( :is_top, :created_at ).page( params[:page_main] ).per(@page_num)
-      else
-        @archive_files = ArchiveFile.can_display.desc( :is_top, :created_at ).page( params[:page_main] ).per(@page_num)
-      end
+      @archive_files = ArchiveFile.default_sort(params[:sort]).can_display.desc( :is_top ).page( params[:page_main] ).per(@page_num)
     end
       
 
     get_categorys
+
+    if params[:sort]
+      @archive_files = get_sorted_and_filtered('archive_file', nil, @archive_files)
+    end
   end
 
   def show
diff --git a/vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/_index.html.erb b/vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/_index.html.erb
new file mode 100644
index 000000000..b5aded496
--- /dev/null
+++ b/vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/_index.html.erb
@@ -0,0 +1,56 @@
+<% # encoding: utf-8 %>
+
+
+	<div class="o-archives layout-table">
+
+		<table>
+			<thead>
+				<tr>
+					<th class="column-ctrl col-title"><%= sortable(:title, t("archive.Title"))%></th>
+					<th class="column-ctrl col-file"><%= t("archive.Files")%></th>
+					<th class="column-ctrl col-category"><%= sortable(:archive_file_category, t("archive.Category"))%></th>
+				</tr>
+			</thead>
+			<tbody>
+
+				<% @archive_files.each_with_index do |post,i| %>
+				<tr <% if ( (i + 1) % 2 ) == 0 %> class="even" <% end %>>
+					<td><div class="o-archives-title"><%= post.title %></div></td>
+					<td>
+						<div class="o-archives-list-item">
+							<% if !post.archive_file_multiples.blank? %>
+							<ol>
+								<% post.archive_file_multiples.asc(:_id).each do | afile |  %>
+									<%  if afile.file.file and afile.choose_lang_display(I18n.locale.to_s) %>
+										<li>
+											<%= link_to afile.file_title, afile.file.url, {:target => '_blank', :title => afile.file_title, :class => "o-archives-file"} %>
+											<%= post.get_file_icon(afile.file.url) %>
+										</li>
+									<% end %>
+								<% end %>
+							</ol>
+							<% end %>
+						</div>
+					</td>
+					<td><div class="o-archives-category">
+						<%= post.archive_file_category.title %>
+					</div></td>
+				</tr>
+				<% end %>
+
+			</tbody>
+		</table>
+	</div>
+
+<%= paginate @archive_files, :param_name => :page_main, :params => {:inner => 'false'} %>
+
+<%= stylesheet_link_tag "archive/archives" %>
+
+
+
+
+
+
+
+
+
diff --git a/vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb b/vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb
index 3028774db..383453b5a 100644
--- a/vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb
+++ b/vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb
@@ -1,57 +1,9 @@
-<% # encoding: utf-8 %>
+<%= stylesheet_link_tag "default_widget" %>
+<script type='text/javascript' src='/assets/jquery.mu.image.resize.js'></script>
+<script type='text/javascript' src='/assets/jquery.mu.image.resize.degsin.js'></script>
 
-<%= render :partial => 'shared/search_header',:locals=>{:items=>@archive_files}  %>
-
-	<div class="o-archives layout-table">
-
-		<table>
-			<thead>
-				<tr>
-					<th class="column-ctrl col-title"><%= t("archive.Title")%></th>
-					<th class="column-ctrl col-file"><%= t("archive.Files")%></th>
-					<th class="column-ctrl col-category"><%= t("archive.Category")%></th>
-				</tr>
-			</thead>
-			<tbody>
-
-				<% @archive_files.each_with_index do |post,i| %>
-				<tr <% if i.even?%> class="even" <% end %>>
-					<td><div class="o-archives-title"><%= post.title %></div></td>
-					<td>
-						<div class="o-archives-list-item">
-							<% if !post.archive_file_multiples.blank? %>
-							<ol>
-								<% post.archive_file_multiples.asc(:_id).each do | afile |  %>	
-									<%  if afile.file.file and afile.choose_lang_display(I18n.locale.to_s) %>
-										<li>
-											<%= link_to afile.file_title, afile.file.url, {:target => '_blank', :title => afile.file_title, :class => "o-archives-file"} %>
-											<%= post.get_file_icon(afile.file.url) %>
-										</li>
-									<% end %>
-								<% end %>
-							</ol>
-							<% end %>
-						</div>
-					</td>
-					<td><div class="o-archives-category">
-						<%= post.archive_file_category.title %>
-					</div></td>
-				</tr>
-				<% end %>
-
-			</tbody>
-		</table>
-	</div>
-
-<%= paginate @archive_files, :param_name => :page_main, :params => {:inner => 'false'} %>
+<div id="archive_file_widget">
+	<%= render 'index' %>
+</div>
 
 <%= stylesheet_link_tag "archive/archives" %>
-
-
-
-
-
-
-
-
-
diff --git a/vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.js.erb b/vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.js.erb
new file mode 100644
index 000000000..a0afb16fa
--- /dev/null
+++ b/vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.js.erb
@@ -0,0 +1 @@
+$('#archive_file_widget').html("<%= j render 'index' %>")