diff --git a/app/assets/javascripts/back_end.js b/app/assets/javascripts/back_end.js
index affd9a06a..0b2af80ec 100644
--- a/app/assets/javascripts/back_end.js
+++ b/app/assets/javascripts/back_end.js
@@ -2,4 +2,5 @@
 //= require lib/footable-0.1.js
 //= require lib/all-list
 //= require lib/jquery.fastLiveFilter.js
-//= require lib/checkbox.card.js
\ No newline at end of file
+//= require lib/checkbox.card.js
+//= require lib/jquery.form.js
\ No newline at end of file
diff --git a/app/assets/javascripts/lib/bootstrap-datetimepicker.js b/app/assets/javascripts/lib/bootstrap-datetimepicker.js
index 8bd2ae807..4c5e6c9d0 100644
--- a/app/assets/javascripts/lib/bootstrap-datetimepicker.js
+++ b/app/assets/javascripts/lib/bootstrap-datetimepicker.js
@@ -698,6 +698,7 @@
     clear: function(e) {
       if (this.isInput) this.$element.val(null);
       else this.$element.find('input').val(null);
+      this.notifyChange();
     },
 
     showMode: function(dir) {
diff --git a/app/assets/javascripts/lib/datetimepicker/datetimepicker.js b/app/assets/javascripts/lib/datetimepicker/datetimepicker.js
new file mode 100644
index 000000000..83408a24d
--- /dev/null
+++ b/app/assets/javascripts/lib/datetimepicker/datetimepicker.js
@@ -0,0 +1,33 @@
+$(document).ready(function(){
+
+  $('.date_picker').datetimepicker({
+      pickTime: false
+  });
+
+  $('.default_picker').datetimepicker();
+
+  $('.time_picker').datetimepicker({
+      pickDate: false
+  });
+
+  $('.separated_picker div').on("changeDate",function(){
+    if ($(this).hasClass('date_picker'))
+    {
+      if ($(this).find('input').val() && $(this).siblings('div').css('pointer-events'))
+      {
+        $(this).siblings('div').css('pointer-events', '');
+      }
+      else
+      {
+        $(this).siblings('div').find('input').val(null);
+        $(this).siblings('div').css('pointer-events', 'none');
+      }
+    }
+    $(this).siblings('input').val($(this).find('input').val() + ' ' + $(this).siblings('div').find('input').val());
+  });
+
+  // $('.date_picker').on("changeDate",function(){
+  //   $(this).find('input').val('');
+  // });
+
+});
\ No newline at end of file
diff --git a/app/assets/javascripts/lib/jquery.form.js b/app/assets/javascripts/lib/jquery.form.js
new file mode 100644
index 000000000..7f11d05c8
--- /dev/null
+++ b/app/assets/javascripts/lib/jquery.form.js
@@ -0,0 +1,980 @@
+/*!
+ * jQuery Form Plugin
+ * version: 2.94 (13-DEC-2011)
+ * @requires jQuery v1.3.2 or later
+ *
+ * Examples and documentation at: http://malsup.com/jquery/form/
+ * Dual licensed under the MIT and GPL licenses:
+ *	http://www.opensource.org/licenses/mit-license.php
+ *	http://www.gnu.org/licenses/gpl.html
+ */
+;(function($) {
+
+/*
+	Usage Note:
+	-----------
+	Do not use both ajaxSubmit and ajaxForm on the same form.  These
+	functions are intended to be exclusive.  Use ajaxSubmit if you want
+	to bind your own submit handler to the form.  For example,
+
+	$(document).ready(function() {
+		$('#myForm').bind('submit', function(e) {
+			e.preventDefault(); // <-- important
+			$(this).ajaxSubmit({
+				target: '#output'
+			});
+		});
+	});
+
+	Use ajaxForm when you want the plugin to manage all the event binding
+	for you.  For example,
+
+	$(document).ready(function() {
+		$('#myForm').ajaxForm({
+			target: '#output'
+		});
+	});
+
+	When using ajaxForm, the ajaxSubmit function will be invoked for you
+	at the appropriate time.
+*/
+
+/**
+ * ajaxSubmit() provides a mechanism for immediately submitting
+ * an HTML form using AJAX.
+ */
+$.fn.ajaxSubmit = function(options) {
+	// fast fail if nothing selected (http://dev.jquery.com/ticket/2752)
+	if (!this.length) {
+		log('ajaxSubmit: skipping submit process - no element selected');
+		return this;
+	}
+	
+	var method, action, url, $form = this;
+
+	if (typeof options == 'function') {
+		options = { success: options };
+	}
+
+	method = this.attr('method');
+	action = this.attr('action');
+	url = (typeof action === 'string') ? $.trim(action) : '';
+	url = url || window.location.href || '';
+	if (url) {
+		// clean url (don't include hash vaue)
+		url = (url.match(/^([^#]+)/)||[])[1];
+	}
+
+	options = $.extend(true, {
+		url:  url,
+		success: $.ajaxSettings.success,
+		type: method || 'GET',
+		iframeSrc: /^https/i.test(window.location.href || '') ? 'javascript:false' : 'about:blank'
+	}, options);
+
+	// hook for manipulating the form data before it is extracted;
+	// convenient for use with rich editors like tinyMCE or FCKEditor
+	var veto = {};
+	this.trigger('form-pre-serialize', [this, options, veto]);
+	if (veto.veto) {
+		log('ajaxSubmit: submit vetoed via form-pre-serialize trigger');
+		return this;
+	}
+
+	// provide opportunity to alter form data before it is serialized
+	if (options.beforeSerialize && options.beforeSerialize(this, options) === false) {
+		log('ajaxSubmit: submit aborted via beforeSerialize callback');
+		return this;
+	}
+
+	var traditional = options.traditional;
+	if ( traditional === undefined ) {
+		traditional = $.ajaxSettings.traditional;
+	}
+	
+	var qx,n,v,a = this.formToArray(options.semantic);
+	if (options.data) {
+		options.extraData = options.data;
+		qx = $.param(options.data, traditional);
+	}
+
+	// give pre-submit callback an opportunity to abort the submit
+	if (options.beforeSubmit && options.beforeSubmit(a, this, options) === false) {
+		log('ajaxSubmit: submit aborted via beforeSubmit callback');
+		return this;
+	}
+
+	// fire vetoable 'validate' event
+	this.trigger('form-submit-validate', [a, this, options, veto]);
+	if (veto.veto) {
+		log('ajaxSubmit: submit vetoed via form-submit-validate trigger');
+		return this;
+	}
+
+	var q = $.param(a, traditional);
+	if (qx) {
+		q = ( q ? (q + '&' + qx) : qx );
+	}	
+	if (options.type.toUpperCase() == 'GET') {
+		options.url += (options.url.indexOf('?') >= 0 ? '&' : '?') + q;
+		options.data = null;  // data is null for 'get'
+	}
+	else {
+		options.data = q; // data is the query string for 'post'
+	}
+
+	var callbacks = [];
+	if (options.resetForm) {
+		callbacks.push(function() { $form.resetForm(); });
+	}
+	if (options.clearForm) {
+		callbacks.push(function() { $form.clearForm(options.includeHidden); });
+	}
+
+	// perform a load on the target only if dataType is not provided
+	if (!options.dataType && options.target) {
+		var oldSuccess = options.success || function(){};
+		callbacks.push(function(data) {
+			var fn = options.replaceTarget ? 'replaceWith' : 'html';
+			$(options.target)[fn](data).each(oldSuccess, arguments);
+		});
+	}
+	else if (options.success) {
+		callbacks.push(options.success);
+	}
+
+	options.success = function(data, status, xhr) { // jQuery 1.4+ passes xhr as 3rd arg
+		var context = options.context || options;	// jQuery 1.4+ supports scope context 
+		for (var i=0, max=callbacks.length; i < max; i++) {
+			callbacks[i].apply(context, [data, status, xhr || $form, $form]);
+		}
+	};
+
+	// are there files to upload?
+	var fileInputs = $('input:file:enabled[value]', this); // [value] (issue #113)
+	var hasFileInputs = fileInputs.length > 0;
+	var mp = 'multipart/form-data';
+	var multipart = ($form.attr('enctype') == mp || $form.attr('encoding') == mp);
+
+	var fileAPI = !!(hasFileInputs && fileInputs.get(0).files && window.FormData);
+	log("fileAPI :" + fileAPI);
+	var shouldUseFrame = (hasFileInputs || multipart) && !fileAPI;
+
+	// options.iframe allows user to force iframe mode
+	// 06-NOV-09: now defaulting to iframe mode if file input is detected
+	if (options.iframe !== false && (options.iframe || shouldUseFrame)) {
+		// hack to fix Safari hang (thanks to Tim Molendijk for this)
+		// see:  http://groups.google.com/group/jquery-dev/browse_thread/thread/36395b7ab510dd5d
+		if (options.closeKeepAlive) {
+			$.get(options.closeKeepAlive, function() {
+				fileUploadIframe(a);
+			});
+		}
+  		else {
+			fileUploadIframe(a);
+  		}
+	}
+	else if ((hasFileInputs || multipart) && fileAPI) {
+		options.progress = options.progress || $.noop;
+		fileUploadXhr(a);
+	}
+	else {
+		$.ajax(options);
+	}
+
+	 // fire 'notify' event
+	 this.trigger('form-submit-notify', [this, options]);
+	 return this;
+
+	 // XMLHttpRequest Level 2 file uploads (big hat tip to francois2metz)
+	function fileUploadXhr(a) {
+		var formdata = new FormData();
+
+		for (var i=0; i < a.length; i++) {
+			if (a[i].type == 'file')
+				continue;
+			formdata.append(a[i].name, a[i].value);
+		}
+
+		$form.find('input:file:enabled').each(function(){
+			var name = $(this).attr('name'), files = this.files;
+			if (name) {
+				for (var i=0; i < files.length; i++)
+					formdata.append(name, files[i]);
+			}
+		});
+
+		if (options.extraData) {
+			for (var k in options.extraData)
+				formdata.append(k, options.extraData[k])
+		}
+
+		options.data = null;
+
+		var s = $.extend(true, {}, $.ajaxSettings, options, {
+			contentType: false,
+			processData: false,
+			cache: false,
+			type: 'POST'
+		});
+
+      s.context = s.context || s;
+
+      s.data = null;
+      var beforeSend = s.beforeSend;
+      s.beforeSend = function(xhr, o) {
+          o.data = formdata;
+          if(xhr.upload) { // unfortunately, jQuery doesn't expose this prop (http://bugs.jquery.com/ticket/10190)
+              xhr.upload.onprogress = function(event) {
+                  o.progress(event.position, event.total);
+              };
+          }
+          if(beforeSend)
+              beforeSend.call(o, xhr, options);
+      };
+      $.ajax(s);
+   }
+
+	// private function for handling file uploads (hat tip to YAHOO!)
+	function fileUploadIframe(a) {
+		var form = $form[0], el, i, s, g, id, $io, io, xhr, sub, n, timedOut, timeoutHandle;
+		var useProp = !!$.fn.prop;
+
+		if (a) {
+			if ( useProp ) {
+				// ensure that every serialized input is still enabled
+				for (i=0; i < a.length; i++) {
+					el = $(form[a[i].name]);
+					el.prop('disabled', false);
+				}
+			} else {
+				for (i=0; i < a.length; i++) {
+					el = $(form[a[i].name]);
+					el.removeAttr('disabled');
+				}
+			};
+		}
+
+		if ($(':input[name=submit],:input[id=submit]', form).length) {
+			// if there is an input with a name or id of 'submit' then we won't be
+			// able to invoke the submit fn on the form (at least not x-browser)
+			alert('Error: Form elements must not have name or id of "submit".');
+			return;
+		}
+		
+		s = $.extend(true, {}, $.ajaxSettings, options);
+		s.context = s.context || s;
+		id = 'jqFormIO' + (new Date().getTime());
+		if (s.iframeTarget) {
+			$io = $(s.iframeTarget);
+			n = $io.attr('name');
+			if (n == null)
+			 	$io.attr('name', id);
+			else
+				id = n;
+		}
+		else {
+			$io = $('<iframe name="' + id + '" src="'+ s.iframeSrc +'" />');
+			$io.css({ position: 'absolute', top: '-1000px', left: '-1000px' });
+		}
+		io = $io[0];
+
+
+		xhr = { // mock object
+			aborted: 0,
+			responseText: null,
+			responseXML: null,
+			status: 0,
+			statusText: 'n/a',
+			getAllResponseHeaders: function() {},
+			getResponseHeader: function() {},
+			setRequestHeader: function() {},
+			abort: function(status) {
+				var e = (status === 'timeout' ? 'timeout' : 'aborted');
+				log('aborting upload... ' + e);
+				this.aborted = 1;
+				$io.attr('src', s.iframeSrc); // abort op in progress
+				xhr.error = e;
+				s.error && s.error.call(s.context, xhr, e, status);
+				g && $.event.trigger("ajaxError", [xhr, s, e]);
+				s.complete && s.complete.call(s.context, xhr, e);
+			}
+		};
+
+		g = s.global;
+		// trigger ajax global events so that activity/block indicators work like normal
+		if (g && ! $.active++) {
+			$.event.trigger("ajaxStart");
+		}
+		if (g) {
+			$.event.trigger("ajaxSend", [xhr, s]);
+		}
+
+		if (s.beforeSend && s.beforeSend.call(s.context, xhr, s) === false) {
+			if (s.global) {
+				$.active--;
+			}
+			return;
+		}
+		if (xhr.aborted) {
+			return;
+		}
+
+		// add submitting element to data if we know it
+		sub = form.clk;
+		if (sub) {
+			n = sub.name;
+			if (n && !sub.disabled) {
+				s.extraData = s.extraData || {};
+				s.extraData[n] = sub.value;
+				if (sub.type == "image") {
+					s.extraData[n+'.x'] = form.clk_x;
+					s.extraData[n+'.y'] = form.clk_y;
+				}
+			}
+		}
+		
+		var CLIENT_TIMEOUT_ABORT = 1;
+		var SERVER_ABORT = 2;
+
+		function getDoc(frame) {
+			var doc = frame.contentWindow ? frame.contentWindow.document : frame.contentDocument ? frame.contentDocument : frame.document;
+			return doc;
+		}
+		
+		// Rails CSRF hack (thanks to Yvan Barthelemy)
+		var csrf_token = $('meta[name=csrf-token]').attr('content');
+		var csrf_param = $('meta[name=csrf-param]').attr('content');
+		if (csrf_param && csrf_token) {
+			s.extraData = s.extraData || {};
+			s.extraData[csrf_param] = csrf_token;
+		}
+
+		// take a breath so that pending repaints get some cpu time before the upload starts
+		function doSubmit() {
+			// make sure form attrs are set
+			var t = $form.attr('target'), a = $form.attr('action');
+
+			// update form attrs in IE friendly way
+			form.setAttribute('target',id);
+			if (!method) {
+				form.setAttribute('method', 'POST');
+			}
+			if (a != s.url) {
+				form.setAttribute('action', s.url);
+			}
+
+			// ie borks in some cases when setting encoding
+			if (! s.skipEncodingOverride && (!method || /post/i.test(method))) {
+				$form.attr({
+					encoding: 'multipart/form-data',
+					enctype:  'multipart/form-data'
+				});
+			}
+
+			// support timout
+			if (s.timeout) {
+				timeoutHandle = setTimeout(function() { timedOut = true; cb(CLIENT_TIMEOUT_ABORT); }, s.timeout);
+			}
+			
+			// look for server aborts
+			function checkState() {
+				try {
+					var state = getDoc(io).readyState;
+					log('state = ' + state);
+					if (state.toLowerCase() == 'uninitialized')
+						setTimeout(checkState,50);
+				}
+				catch(e) {
+					log('Server abort: ' , e, ' (', e.name, ')');
+					cb(SERVER_ABORT);
+					timeoutHandle && clearTimeout(timeoutHandle);
+					timeoutHandle = undefined;
+				}
+			}
+
+			// add "extra" data to form if provided in options
+			var extraInputs = [];
+			try {
+				if (s.extraData) {
+					for (var n in s.extraData) {
+						extraInputs.push(
+							$('<input type="hidden" name="'+n+'">').attr('value',s.extraData[n])
+								.appendTo(form)[0]);
+					}
+				}
+
+				if (!s.iframeTarget) {
+					// add iframe to doc and submit the form
+					$io.appendTo('body');
+					io.attachEvent ? io.attachEvent('onload', cb) : io.addEventListener('load', cb, false);
+				}
+				setTimeout(checkState,15);
+				form.submit();
+			}
+			finally {
+				// reset attrs and remove "extra" input elements
+				form.setAttribute('action',a);
+				if(t) {
+					form.setAttribute('target', t);
+				} else {
+					$form.removeAttr('target');
+				}
+				$(extraInputs).remove();
+			}
+		}
+
+		if (s.forceSync) {
+			doSubmit();
+		}
+		else {
+			setTimeout(doSubmit, 10); // this lets dom updates render
+		}
+
+		var data, doc, domCheckCount = 50, callbackProcessed;
+
+		function cb(e) {
+			if (xhr.aborted || callbackProcessed) {
+				return;
+			}
+			try {
+				doc = getDoc(io);
+			}
+			catch(ex) {
+				log('cannot access response document: ', ex);
+				e = SERVER_ABORT;
+			}
+			if (e === CLIENT_TIMEOUT_ABORT && xhr) {
+				xhr.abort('timeout');
+				return;
+			}
+			else if (e == SERVER_ABORT && xhr) {
+				xhr.abort('server abort');
+				return;
+			}
+
+			if (!doc || doc.location.href == s.iframeSrc) {
+				// response not received yet
+				if (!timedOut)
+					return;
+			}
+			io.detachEvent ? io.detachEvent('onload', cb) : io.removeEventListener('load', cb, false);
+
+			var status = 'success', errMsg;
+			try {
+				if (timedOut) {
+					throw 'timeout';
+				}
+
+				var isXml = s.dataType == 'xml' || doc.XMLDocument || $.isXMLDoc(doc);
+				log('isXml='+isXml);
+				if (!isXml && window.opera && (doc.body == null || doc.body.innerHTML == '')) {
+					if (--domCheckCount) {
+						// in some browsers (Opera) the iframe DOM is not always traversable when
+						// the onload callback fires, so we loop a bit to accommodate
+						log('requeing onLoad callback, DOM not available');
+						setTimeout(cb, 250);
+						return;
+					}
+					// let this fall through because server response could be an empty document
+					//log('Could not access iframe DOM after mutiple tries.');
+					//throw 'DOMException: not available';
+				}
+
+				//log('response detected');
+				var docRoot = doc.body ? doc.body : doc.documentElement;
+				xhr.responseText = docRoot ? docRoot.innerHTML : null;
+				xhr.responseXML = doc.XMLDocument ? doc.XMLDocument : doc;
+				if (isXml)
+					s.dataType = 'xml';
+				xhr.getResponseHeader = function(header){
+					var headers = {'content-type': s.dataType};
+					return headers[header];
+				};
+				// support for XHR 'status' & 'statusText' emulation :
+				if (docRoot) {
+					xhr.status = Number( docRoot.getAttribute('status') ) || xhr.status;
+					xhr.statusText = docRoot.getAttribute('statusText') || xhr.statusText;
+				}
+
+				var dt = (s.dataType || '').toLowerCase();
+				var scr = /(json|script|text)/.test(dt);
+				if (scr || s.textarea) {
+					// see if user embedded response in textarea
+					var ta = doc.getElementsByTagName('textarea')[0];
+					if (ta) {
+						xhr.responseText = ta.value;
+						// support for XHR 'status' & 'statusText' emulation :
+						xhr.status = Number( ta.getAttribute('status') ) || xhr.status;
+						xhr.statusText = ta.getAttribute('statusText') || xhr.statusText;
+					}
+					else if (scr) {
+						// account for browsers injecting pre around json response
+						var pre = doc.getElementsByTagName('pre')[0];
+						var b = doc.getElementsByTagName('body')[0];
+						if (pre) {
+							xhr.responseText = pre.textContent ? pre.textContent : pre.innerText;
+						}
+						else if (b) {
+							xhr.responseText = b.textContent ? b.textContent : b.innerText;
+						}
+					}
+				}
+				else if (dt == 'xml' && !xhr.responseXML && xhr.responseText != null) {
+					xhr.responseXML = toXml(xhr.responseText);
+				}
+
+				try {
+					data = httpData(xhr, dt, s);
+				}
+				catch (e) {
+					status = 'parsererror';
+					xhr.error = errMsg = (e || status);
+				}
+			}
+			catch (e) {
+				log('error caught: ',e);
+				status = 'error';
+				xhr.error = errMsg = (e || status);
+			}
+
+			if (xhr.aborted) {
+				log('upload aborted');
+				status = null;
+			}
+
+			if (xhr.status) { // we've set xhr.status
+				status = (xhr.status >= 200 && xhr.status < 300 || xhr.status === 304) ? 'success' : 'error';
+			}
+
+			// ordering of these callbacks/triggers is odd, but that's how $.ajax does it
+			if (status === 'success') {
+				s.success && s.success.call(s.context, data, 'success', xhr);
+				g && $.event.trigger("ajaxSuccess", [xhr, s]);
+			}
+			else if (status) {
+				if (errMsg == undefined)
+					errMsg = xhr.statusText;
+				s.error && s.error.call(s.context, xhr, status, errMsg);
+				g && $.event.trigger("ajaxError", [xhr, s, errMsg]);
+			}
+
+			g && $.event.trigger("ajaxComplete", [xhr, s]);
+
+			if (g && ! --$.active) {
+				$.event.trigger("ajaxStop");
+			}
+
+			s.complete && s.complete.call(s.context, xhr, status);
+
+			callbackProcessed = true;
+			if (s.timeout)
+				clearTimeout(timeoutHandle);
+
+			// clean up
+			setTimeout(function() {
+				if (!s.iframeTarget)
+					$io.remove();
+				xhr.responseXML = null;
+			}, 100);
+		}
+
+		var toXml = $.parseXML || function(s, doc) { // use parseXML if available (jQuery 1.5+)
+			if (window.ActiveXObject) {
+				doc = new ActiveXObject('Microsoft.XMLDOM');
+				doc.async = 'false';
+				doc.loadXML(s);
+			}
+			else {
+				doc = (new DOMParser()).parseFromString(s, 'text/xml');
+			}
+			return (doc && doc.documentElement && doc.documentElement.nodeName != 'parsererror') ? doc : null;
+		};
+		var parseJSON = $.parseJSON || function(s) {
+			return window['eval']('(' + s + ')');
+		};
+
+		var httpData = function( xhr, type, s ) { // mostly lifted from jq1.4.4
+
+			var ct = xhr.getResponseHeader('content-type') || '',
+				xml = type === 'xml' || !type && ct.indexOf('xml') >= 0,
+				data = xml ? xhr.responseXML : xhr.responseText;
+
+			if (xml && data.documentElement.nodeName === 'parsererror') {
+				$.error && $.error('parsererror');
+			}
+			if (s && s.dataFilter) {
+				data = s.dataFilter(data, type);
+			}
+			if (typeof data === 'string') {
+				if (type === 'json' || !type && ct.indexOf('json') >= 0) {
+					data = parseJSON(data);
+				} else if (type === "script" || !type && ct.indexOf("javascript") >= 0) {
+					$.globalEval(data);
+				}
+			}
+			return data;
+		};
+	}
+};
+
+/**
+ * ajaxForm() provides a mechanism for fully automating form submission.
+ *
+ * The advantages of using this method instead of ajaxSubmit() are:
+ *
+ * 1: This method will include coordinates for <input type="image" /> elements (if the element
+ *	is used to submit the form).
+ * 2. This method will include the submit element's name/value data (for the element that was
+ *	used to submit the form).
+ * 3. This method binds the submit() method to the form for you.
+ *
+ * The options argument for ajaxForm works exactly as it does for ajaxSubmit.  ajaxForm merely
+ * passes the options argument along after properly binding events for submit elements and
+ * the form itself.
+ */
+$.fn.ajaxForm = function(options) {
+	// in jQuery 1.3+ we can fix mistakes with the ready state
+	if (this.length === 0) {
+		var o = { s: this.selector, c: this.context };
+		if (!$.isReady && o.s) {
+			log('DOM not ready, queuing ajaxForm');
+			$(function() {
+				$(o.s,o.c).ajaxForm(options);
+			});
+			return this;
+		}
+		// is your DOM ready?  http://docs.jquery.com/Tutorials:Introducing_$(document).ready()
+		log('terminating; zero elements found by selector' + ($.isReady ? '' : ' (DOM not ready)'));
+		return this;
+	}
+
+	return this.ajaxFormUnbind().bind('submit.form-plugin', function(e) {
+		if (!e.isDefaultPrevented()) { // if event has been canceled, don't proceed
+			e.preventDefault();
+			$(this).ajaxSubmit(options);
+		}
+	}).bind('click.form-plugin', function(e) {
+		var target = e.target;
+		var $el = $(target);
+		if (!($el.is(":submit,input:image"))) {
+			// is this a child element of the submit el?  (ex: a span within a button)
+			var t = $el.closest(':submit');
+			if (t.length == 0) {
+				return;
+			}
+			target = t[0];
+		}
+		var form = this;
+		form.clk = target;
+		if (target.type == 'image') {
+			if (e.offsetX != undefined) {
+				form.clk_x = e.offsetX;
+				form.clk_y = e.offsetY;
+			} else if (typeof $.fn.offset == 'function') { // try to use dimensions plugin
+				var offset = $el.offset();
+				form.clk_x = e.pageX - offset.left;
+				form.clk_y = e.pageY - offset.top;
+			} else {
+				form.clk_x = e.pageX - target.offsetLeft;
+				form.clk_y = e.pageY - target.offsetTop;
+			}
+		}
+		// clear form vars
+		setTimeout(function() { form.clk = form.clk_x = form.clk_y = null; }, 100);
+	});
+};
+
+// ajaxFormUnbind unbinds the event handlers that were bound by ajaxForm
+$.fn.ajaxFormUnbind = function() {
+	return this.unbind('submit.form-plugin click.form-plugin');
+};
+
+/**
+ * formToArray() gathers form element data into an array of objects that can
+ * be passed to any of the following ajax functions: $.get, $.post, or load.
+ * Each object in the array has both a 'name' and 'value' property.  An example of
+ * an array for a simple login form might be:
+ *
+ * [ { name: 'username', value: 'jresig' }, { name: 'password', value: 'secret' } ]
+ *
+ * It is this array that is passed to pre-submit callback functions provided to the
+ * ajaxSubmit() and ajaxForm() methods.
+ */
+$.fn.formToArray = function(semantic) {
+	var a = [];
+	if (this.length === 0) {
+		return a;
+	}
+
+	var form = this[0];
+	var els = semantic ? form.getElementsByTagName('*') : form.elements;
+	if (!els) {
+		return a;
+	}
+
+	var i,j,n,v,el,max,jmax;
+	for(i=0, max=els.length; i < max; i++) {
+		el = els[i];
+		n = el.name;
+		if (!n) {
+			continue;
+		}
+
+		if (semantic && form.clk && el.type == "image") {
+			// handle image inputs on the fly when semantic == true
+			if(!el.disabled && form.clk == el) {
+				a.push({name: n, value: $(el).val(), type: el.type });
+				a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
+			}
+			continue;
+		}
+
+		v = $.fieldValue(el, true);
+		if (v && v.constructor == Array) {
+			for(j=0, jmax=v.length; j < jmax; j++) {
+				a.push({name: n, value: v[j]});
+			}
+		}
+		else if (v !== null && typeof v != 'undefined') {
+			a.push({name: n, value: v, type: el.type});
+		}
+	}
+
+	if (!semantic && form.clk) {
+		// input type=='image' are not found in elements array! handle it here
+		var $input = $(form.clk), input = $input[0];
+		n = input.name;
+		if (n && !input.disabled && input.type == 'image') {
+			a.push({name: n, value: $input.val()});
+			a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
+		}
+	}
+	return a;
+};
+
+/**
+ * Serializes form data into a 'submittable' string. This method will return a string
+ * in the format: name1=value1&amp;name2=value2
+ */
+$.fn.formSerialize = function(semantic) {
+	//hand off to jQuery.param for proper encoding
+	return $.param(this.formToArray(semantic));
+};
+
+/**
+ * Serializes all field elements in the jQuery object into a query string.
+ * This method will return a string in the format: name1=value1&amp;name2=value2
+ */
+$.fn.fieldSerialize = function(successful) {
+	var a = [];
+	this.each(function() {
+		var n = this.name;
+		if (!n) {
+			return;
+		}
+		var v = $.fieldValue(this, successful);
+		if (v && v.constructor == Array) {
+			for (var i=0,max=v.length; i < max; i++) {
+				a.push({name: n, value: v[i]});
+			}
+		}
+		else if (v !== null && typeof v != 'undefined') {
+			a.push({name: this.name, value: v});
+		}
+	});
+	//hand off to jQuery.param for proper encoding
+	return $.param(a);
+};
+
+/**
+ * Returns the value(s) of the element in the matched set.  For example, consider the following form:
+ *
+ *  <form><fieldset>
+ *	  <input name="A" type="text" />
+ *	  <input name="A" type="text" />
+ *	  <input name="B" type="checkbox" value="B1" />
+ *	  <input name="B" type="checkbox" value="B2"/>
+ *	  <input name="C" type="radio" value="C1" />
+ *	  <input name="C" type="radio" value="C2" />
+ *  </fieldset></form>
+ *
+ *  var v = $(':text').fieldValue();
+ *  // if no values are entered into the text inputs
+ *  v == ['','']
+ *  // if values entered into the text inputs are 'foo' and 'bar'
+ *  v == ['foo','bar']
+ *
+ *  var v = $(':checkbox').fieldValue();
+ *  // if neither checkbox is checked
+ *  v === undefined
+ *  // if both checkboxes are checked
+ *  v == ['B1', 'B2']
+ *
+ *  var v = $(':radio').fieldValue();
+ *  // if neither radio is checked
+ *  v === undefined
+ *  // if first radio is checked
+ *  v == ['C1']
+ *
+ * The successful argument controls whether or not the field element must be 'successful'
+ * (per http://www.w3.org/TR/html4/interact/forms.html#successful-controls).
+ * The default value of the successful argument is true.  If this value is false the value(s)
+ * for each element is returned.
+ *
+ * Note: This method *always* returns an array.  If no valid value can be determined the
+ *	array will be empty, otherwise it will contain one or more values.
+ */
+$.fn.fieldValue = function(successful) {
+	for (var val=[], i=0, max=this.length; i < max; i++) {
+		var el = this[i];
+		var v = $.fieldValue(el, successful);
+		if (v === null || typeof v == 'undefined' || (v.constructor == Array && !v.length)) {
+			continue;
+		}
+		v.constructor == Array ? $.merge(val, v) : val.push(v);
+	}
+	return val;
+};
+
+/**
+ * Returns the value of the field element.
+ */
+$.fieldValue = function(el, successful) {
+	var n = el.name, t = el.type, tag = el.tagName.toLowerCase();
+	if (successful === undefined) {
+		successful = true;
+	}
+
+	if (successful && (!n || el.disabled || t == 'reset' || t == 'button' ||
+		(t == 'checkbox' || t == 'radio') && !el.checked ||
+		(t == 'submit' || t == 'image') && el.form && el.form.clk != el ||
+		tag == 'select' && el.selectedIndex == -1)) {
+			return null;
+	}
+
+	if (tag == 'select') {
+		var index = el.selectedIndex;
+		if (index < 0) {
+			return null;
+		}
+		var a = [], ops = el.options;
+		var one = (t == 'select-one');
+		var max = (one ? index+1 : ops.length);
+		for(var i=(one ? index : 0); i < max; i++) {
+			var op = ops[i];
+			if (op.selected) {
+				var v = op.value;
+				if (!v) { // extra pain for IE...
+					v = (op.attributes && op.attributes['value'] && !(op.attributes['value'].specified)) ? op.text : op.value;
+				}
+				if (one) {
+					return v;
+				}
+				a.push(v);
+			}
+		}
+		return a;
+	}
+	return $(el).val();
+};
+
+/**
+ * Clears the form data.  Takes the following actions on the form's input fields:
+ *  - input text fields will have their 'value' property set to the empty string
+ *  - select elements will have their 'selectedIndex' property set to -1
+ *  - checkbox and radio inputs will have their 'checked' property set to false
+ *  - inputs of type submit, button, reset, and hidden will *not* be effected
+ *  - button elements will *not* be effected
+ */
+$.fn.clearForm = function(includeHidden) {
+	return this.each(function() {
+		$('input,select,textarea', this).clearFields(includeHidden);
+	});
+};
+
+/**
+ * Clears the selected form elements.
+ */
+$.fn.clearFields = $.fn.clearInputs = function(includeHidden) {
+	var re = /^(?:color|date|datetime|email|month|number|password|range|search|tel|text|time|url|week)$/i; // 'hidden' is not in this list
+	return this.each(function() {
+		var t = this.type, tag = this.tagName.toLowerCase();
+		if (re.test(t) || tag == 'textarea' || (includeHidden && /hidden/.test(t)) ) {
+			this.value = '';
+		}
+		else if (t == 'checkbox' || t == 'radio') {
+			this.checked = false;
+		}
+		else if (tag == 'select') {
+			this.selectedIndex = -1;
+		}
+	});
+};
+
+/**
+ * Resets the form data.  Causes all form elements to be reset to their original value.
+ */
+$.fn.resetForm = function() {
+	return this.each(function() {
+		// guard against an input with the name of 'reset'
+		// note that IE reports the reset function as an 'object'
+		if (typeof this.reset == 'function' || (typeof this.reset == 'object' && !this.reset.nodeType)) {
+			this.reset();
+		}
+	});
+};
+
+/**
+ * Enables or disables any matching elements.
+ */
+$.fn.enable = function(b) {
+	if (b === undefined) {
+		b = true;
+	}
+	return this.each(function() {
+		this.disabled = !b;
+	});
+};
+
+/**
+ * Checks/unchecks any matching checkboxes or radio buttons and
+ * selects/deselects and matching option elements.
+ */
+$.fn.selected = function(select) {
+	if (select === undefined) {
+		select = true;
+	}
+	return this.each(function() {
+		var t = this.type;
+		if (t == 'checkbox' || t == 'radio') {
+			this.checked = select;
+		}
+		else if (this.tagName.toLowerCase() == 'option') {
+			var $sel = $(this).parent('select');
+			if (select && $sel[0] && $sel[0].type == 'select-one') {
+				// deselect all other options
+				$sel.find('option').selected(false);
+			}
+			this.selected = select;
+		}
+	});
+};
+
+// expose debug var
+$.fn.ajaxSubmit.debug = false;
+
+// helper fn for console logging
+function log() {
+	if (!$.fn.ajaxSubmit.debug) 
+		return;
+	var msg = '[jquery.form] ' + Array.prototype.join.call(arguments,'');
+	if (window.console && window.console.log) {
+		window.console.log(msg);
+	}
+	else if (window.opera && window.opera.postError) {
+		window.opera.postError(msg);
+	}
+};
+
+})(jQuery);
diff --git a/app/assets/javascripts/lib/modal-preview.js b/app/assets/javascripts/lib/modal-preview.js
new file mode 100644
index 000000000..475e56393
--- /dev/null
+++ b/app/assets/javascripts/lib/modal-preview.js
@@ -0,0 +1,72 @@
+//Preview need a link in form as Ex and a corresponding PUT action in controller
+//Ex preview trigger:
+// <%= link_to "NewPreview", realtime_preview_admin_ad_banner_path(ad_banner_tab) , :class=>'preview_trigger'%>
+
+$(document).ready(function() {
+	// $(".post_preview").click(function(e){
+	// 	$("#main-wrap").after("<span id='show_preview'></span>");
+	// 	e.preventDefault();
+	// 	var form = $(this).parents("form").first()
+ //        	//var cont = form["content"].value;
+ //   //      	$.ajax({
+ //   //      		type: 'POST',
+ //   //      		url: $(this).attr("href")+'?preview=true',
+ //   //      		data: form.serialize(),
+ //   //      		dataType: "script",
+ //   //      		success: function (msg) {
+	// 		// 		$("#"+start_modal_with_id).modal('show'); },
+	// 		// error: function(){
+	// 		// 	alert("ERROR");
+	// 		// 	}
+ //   //      	});
+	// 		url = "/panel/news/back_end/news_bulletins/preview?preview=true"
+	// 		// alert(url)
+	// 		form.attr("action",url);
+ //        	form.submit();
+	// 	//return false;
+	// });
+	$("button.post_preview").click(function(){
+		var btn = document.getElementById("button_for_preview");
+		var attrs = btn.attributes;
+		var url = attrs['url'];
+		// url = url.replace("url=","");
+		$("form.previewable").ajaxSubmit({
+			beforeSubmit: function(a,f,o){
+				$("#main-wrap").after("<span id='show_preview'></span>");
+				o.dataType = 'script';
+				o.url = url.nodeValue;
+				o.type =  'post';
+			},success: function(msg) { }
+
+		});
+	})
+	// $("form.nccu_ajax_form").ajaxForm({
+ //        beforeSubmit: function(a,f,o) {
+ //        	// if(clicked_what.hasClass("post_preview")){
+ //         //          $("#main-wrap").after("<span id='show_preview'></span>");
+ //         //          o.dataType = 'script';
+ //         //          o.url = clicked_what.attr("url");
+ //         //    }
+ //        },
+ //        success: function(data) {
+ //             // if(!clicked_what.hasClass("post_preview")){
+ //             //    window.location = data.redirect_url;
+ //             // }
+ //          }
+ //    })
+
+	$("a.preview_trigger").on('click',function(){
+		$("#main-wrap").after("<span id='show_preview'></span>");
+		$.ajax({
+			type: 'PUT',
+			url:$(this).attr("href"),
+			data:$(this).parents("form").serialize(),
+			success: function (msg) {
+					$("#"+start_modal_with_id).modal('show'); },
+			error: function(){
+				alert("ERROR");
+				}
+			});  
+			return false;
+		});
+});
\ No newline at end of file
diff --git a/app/controllers/admin/tags_controller.rb b/app/controllers/admin/tags_controller.rb
index 817a9726b..c28470c92 100644
--- a/app/controllers/admin/tags_controller.rb
+++ b/app/controllers/admin/tags_controller.rb
@@ -40,7 +40,7 @@ class Admin::TagsController < OrbitBackendController
     if @tag.update_attributes(params[:module_tag])
       redirect_to action: :index
     else
-      flash.now[:error] = t('update.error.link')
+      flash.now[:error] = t('update.error.tag')
       render :action => "edit"
     end
   end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index db7d88a31..2db288d03 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -142,6 +142,8 @@ class ApplicationController < ActionController::Base
     end 
     session[:locale] = condition ? (browser_locale || session[:locale]) : I18n.default_locale.to_s
     I18n.locale = session[:locale].to_sym
+    @site_in_use_locales = site_locales_default_head(@site.in_use_locales)
+    @site_valid_locales = site_locales_default_head(@site.valid_locales)
   end
     
   # Set the site variables
@@ -149,8 +151,6 @@ class ApplicationController < ActionController::Base
     # set site if exist or create site
     @site = Site.first || Site.create({:valid_locales => [], :in_use_locales => []})
     session[:site] = @site.id
-    @site_in_use_locales = site_locales_default_head(@site.in_use_locales)
-    @site_valid_locales = site_locales_default_head(@site.valid_locales)
   end
   
   def set_current_item
diff --git a/app/controllers/orbit_backend_controller.rb b/app/controllers/orbit_backend_controller.rb
index 699425288..7eeb7eb24 100644
--- a/app/controllers/orbit_backend_controller.rb
+++ b/app/controllers/orbit_backend_controller.rb
@@ -4,6 +4,8 @@ class OrbitBackendController < ApplicationController
   include OrbitTag::Tagging
   include AdminHelper
   include ApplicationHelper
+
+  helper :default_index
   
   layout "back_end"
   
@@ -163,7 +165,7 @@ class OrbitBackendController < ApplicationController
 
   def get_viewable(object_class, query=nil)
     objects = get_objects(object_class,query).order_by(:created_at, :desc)
-    Kaminari.paginate_array(objects).page(params[:page]).per(10)
+    Kaminari.paginate_array(objects).page(params[:page]).per(5)
   end
 
   def get_objects(object_class, query=nil)
diff --git a/app/helpers/default_index_helper.rb b/app/helpers/default_index_helper.rb
new file mode 100644
index 000000000..c552e91c5
--- /dev/null
+++ b/app/helpers/default_index_helper.rb
@@ -0,0 +1,11 @@
+module DefaultIndexHelper
+
+  def show_title_at_index(object)
+    if object.class.instance_methods.include?(:is_checked?) && object.bulletin.is_checked?
+      link_to bulletin.title, panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category.id) rescue ''
+    else
+      bulletin.title
+    end  
+  end
+
+end
\ No newline at end of file
diff --git a/app/helpers/orbit_backend_helper.rb b/app/helpers/orbit_backend_helper.rb
index c1894ac2f..d5f0578eb 100644
--- a/app/helpers/orbit_backend_helper.rb
+++ b/app/helpers/orbit_backend_helper.rb
@@ -1,51 +1,289 @@
 module OrbitBackendHelper
 
-  def sortable(column)
-    direction = (column == params[:sort] && params[:direction] == "asc") ? "desc" : "asc"
-    {:sort => column, :direction => direction}
+#========================================================================================================================
+# from bulletin_helper.rb
+#========================================================================================================================  
+
+  def show_reject_reason(object)
+    by_object = object.is_rejected
+    by_user = (((object.create_user_id == current_user.id) rescue nil) or is_manager? or is_admin?)
+    by_object && by_user
   end
 
-  def is_sort_active?(name)
-    res = ''
-    res << ' select' if params[:sort].eql?(name)
-    res << ' active' if params[:sort].eql?(name) && params[:direction].eql?('asc')
-    res
+  def show_form_status_field(object)
+    #by_object = (!object.is_expired? and object.is_pending?)
+    by_user = ((object.send(@category_field).authed_users('fact_check').include?(current_user) rescue nil) or is_manager? or is_admin?)
+    by_user
   end
 
-  def is_sort?(name)
-    ' web-symbol' if params[:sort].eql?(name)
+  def show_approval_link(object)
+    by_object = (!object.is_expired? and object.is_pending?)
+    by_user = ((object.send(@category_field).authed_users('fact_check').include?(current_user) rescue nil) or is_manager? or is_admin?)
+    by_object and  by_user
   end
 
+  def show_delete_link(object)
+    if !current_user.nil?
+      by_object = (object.create_user_id == current_user.id ) 
+      by_user = (is_manager? or is_admin?)
+      by_object or  by_user  
+    else
+      false
+    end
+    
+  end
+
+  # def show_bulletin_title_at_index (bulletin)
+  #   if bulletin.is_checked?
+  #     link_to bulletin.title, panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category.id) rescue ''
+  #   else
+  #     bulletin.title
+  #   end  
+  # end
+
+#========================================================================================================================
+#========================================================================================================================
+#========================================================================================================================
+#========================================================================================================================
+#========================================================================================================================
+#========================================================================================================================
+#========================================================================================================================
+
   def is_filter_active?(type, id)
     ' active' if (@filter[type].include?(id.to_s) rescue nil)
   end
 
-  def render_sort_bar(delete_all, url, *titles)
-    content_tag :table, :class => "table main-list" do
-      content_tag :thead do
-        content_tag :tr, :class => "sort-header" do
-          concat (content_tag :th, :class => "span1 strong" do
-            concat check_box_tag :check_all
-            concat link_to content_tag(:i, nil, :class => "icon-trash"), '#', :class => "list-remove", :rel => url
-           end) if (delete_all && (is_admin? || (is_manager? rescue nil)))
-          titles.each do |title|
-            concat render_title(title[0], title[1], title[2], title[3])
-          end
-        end
-      end
-    end
-  end
-
-  def render_title(title, fields, span, translation)
-    content_tag :th, :class => "sort #{span} #{is_sort_active?(title)}" do
-      content_tag :span do
-        link_to (t(translation) + content_tag(:b, nil, :class => is_sort?(title))).html_safe, url_for({:filter => @filter}.merge(sortable(title).merge(:sort_options => fields))), :class => 'js_history'
-      end
+  def is_sort_active?(field)
+    res = t(field[:translation])
+    if params[:sort].eql?(field[:sort])
+      res << " " + content_tag(:b, nil, class: (params[:direction].eql?('asc') ? "icons-arrow-up-3" : "icons-arrow-down-4 "))
     end
+    res.html_safe
   end
 
   def show_toggle_archive_btn(object)
-    object.disable ?   t(:disable) : t(:enable) 
+    object.disable ? t(:disable) : t(:enable) 
+  end
+
+  def sortable_options(column)
+    direction = (column == params[:sort] && params[:direction] == "asc") ? "desc" : "asc"
+    {:sort => column, :direction => direction}
+  end
+
+
+  # ===============================================================
+  # associated:
+  #   
+  # TODO: link for other types
+  # ===============================================================
+  def get_value(object, field)
+    authorization = !@authorization || (@authorization && is_authorized(object))
+    approvable = !@approvable || (@approvable && is_approvable(object))
+    res = ''
+    case field[:type]
+    when 'associated'
+      res << object.send(field[:db_field]).send(field[:associated_value]) rescue ''
+    when 'date'
+      res << (object.send(field[:db_field]) ? display_date_time(object.send(field[:db_field])) : t(:no_date))
+    when 'field'
+      res << with_link?(field, object, object.send(field[:db_field]))
+      if field[:quick_edit]
+        res << (content_tag :div, class: "quick-edit" do
+                  content_tag :ul, class: "nav nav-pills" do
+                    @quick_edit.each do |quick|
+                      concat get_quick_link(quick, object, authorization, approvable)
+                    end
+                  end
+                end)
+      end
+    when 'status'
+      if object.is_top?
+        res << content_tag(:span, t(:top), class: "label label-success")
+      end
+      if object.is_hot?
+        res << content_tag(:span, t(:hot), class: "label label-important")
+      end
+      if object.is_hidden?
+        res << content_tag(:span, t(:hidden), class: "label")
+      end
+      if object.is_pending?
+        res << content_tag(:span, t(:pending), class: "label")
+      end
+      if object.is_checked?
+        res << content_tag(:span, t(:passed), class: "label")
+      end
+      if object.is_rejected?
+        res << content_tag(:span, t(:rejected), class: "label")
+      end
+    when 'tags'
+      object.sorted_tags.each do |tag|
+        res << content_tag(:span, tag.name, class: "label label-warning")
+      end if object.tags
+      res.html_safe
+    when 'id'
+      res << field[:id_model].constantize.find(object.send(field[:db_field])).name rescue ''
+    end
+    res.html_safe
+  end
+
+  def index_table
+    content_tag :table, class: "table main-list" do
+      concat (content_tag :thead do
+        (content_tag :tr, class: "sort-header" do
+          @fields.each do |field|
+            concat (content_tag :th, "data-hide" => field[:hide], class: ('active' if params[:sort].eql?(field[:sort])) do
+              if @sortable
+                link_to is_sort_active?(field), url_for({:filter => @filter}.merge(sortable_options(field[:sort]).merge(:sort_options => field[:db_field])))
+              else
+                t(field[:translation])
+              end
+            end)
+          end
+        end)
+      end)
+      concat (content_tag :tbody do
+        (@objects.each do |object|
+          concat (content_tag :tr do
+            (@fields.each do |field|
+              concat(content_tag :td, get_value(object, field))
+            end)
+          end)
+        end)
+      end)
+    end
+  end
+
+  def set_default_index(&block)
+    @approvable = false
+    @authorization = false
+    @categories = []
+    @category_field = nil
+    @fields = []
+    @filterable = false
+    @index_footer = nil
+    @quick_edit = []
+    @sortable = false
+    block.call
+  end
+
+  protected
+
+  def approvable
+    @approvable = true
+  end
+
+  def authorization
+    @authorization = true
+  end
+
+  def category_field(name)
+    @category_field = name
+  end
+
+  # ===============================================================
+  # type:
+  #   check "get_value"
+  # associated_value:
+  #   check "get_value"
+  # db_field:
+  #   name of the field(s) in the database
+  # translation:
+  #   key in the yml translation files
+  # hide:
+  #   - no value: always shown
+  #   - all: alway hidden
+  #   - phone: hidden for phone
+  # sort:
+  #   unique value used for keeping the sorted column
+  # link:
+  #   if provided, the values will be shown as link
+  #   (only available for type 'field' for now)
+  # ===============================================================
+  def field(args={})
+    @fields << args if !args.blank? && args[:type] && args[:translation] && args[:db_field]
+  end
+
+  def filterable(categories)
+    @filterable = true
+    @categories = categories
+  end
+
+  # ===============================================================
+  # args:
+  #   - paginate: default true, there'es no need to specify it
+  #   - link: path to the new action
+  # TODO: links to other actions
+  # ===============================================================
+  def footer(args={})
+    paginate = args.has_key?(:paginate) ? args[:paginate] : true
+    link = (is_manager? || is_sub_manager? rescue nil) && args.has_key?(:link) ? true : false
+    if paginate || link
+      @index_footer = content_tag :div, class: "bottomnav clearfix" do
+        concat content_tag :div, link_to(content_tag(:i, nil, :class => 'icon-plus') + ' ' + t(:add), send(args[:link]), :class => 'btn btn-primary' ), class: "action pull-right" if link
+        concat content_tag :div, paginate(@objects, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]}), class: "pagination pagination-centered" if paginate
+      end
+    end
+  end
+
+  def get_quick_link(quick, object, authorization, approvable)
+    case quick[:type]
+    when 'approval'
+      if show_approval_link(object)
+        content_tag :li, link_to(t(quick[:translation] || :approval_), eval("#{quick[:link]}('#{object.id}')"), class: "preview_trigger #{quick[:class]}")
+      end
+    when 'edit'
+      if authorization && approvable
+        content_tag :li, link_to(t(quick[:translation] || :edit), eval("#{quick[:link]}('#{object.id}')"), class: quick[:class])
+      end
+    when 'delete'
+      if show_delete_link(object)
+        content_tag :li, link_to(t(quick[:translation] || :delete_), '#', rel: eval("#{quick[:link]}('#{object.id}')"), class: "delete_link #{quick[:class] || 'text-error'}")
+      end
+    when 'detail'
+      content_tag :li, link_to(t(quick[:translation] || :detail), '#', class: (quick[:class] || "detail-row"))
+    when 'reject_reason'
+      if show_reject_reason(object)
+        content_tag :li, link_to(t(quick[:translation] || :rejected_reason) + ' ' + truncate(object.not_checked_reason, :length => 10), '#', rel: "tooltip", 'data-original-title' => (wrap_string_with(object.not_checked_reason, :line_width => 24)), class: "reject_info #{quick[:class]}")
+      end
+    else
+      content_tag :li, link_to(t(quick[:translation]), eval("#{quick[:link]}('#{object.id}')"), class: quick[:class])
+    end
+  end
+
+  def is_approvable(object)
+    current_or_guest_user.admin? || (!object.is_rejected? && !object.is_checked?)
+  end
+
+  def is_authorized(object)
+    # TODO: refactor category code and replace following 'bulletin_category'
+    at_least_module_manager || object.send(@category_field).cur_user_is_sub_manager_of(:submit)
+  end
+
+  def quick_edit_link(args)
+    @quick_edit << args
+  end
+
+  def objects(objects)
+    @objects = objects
+  end
+
+  def sortable
+    @sortable = true
+  end
+
+  def with_link?(field, object, value)
+    if field[:link] && @approvable
+      if object.class.instance_methods.include?(:is_checked?) && object.is_checked?
+        link_to(value, eval("#{field[:link]}('#{object.id}')"))
+        # link_to bulletin.title, panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category.id) rescue ''
+      else
+        value
+      end  
+    elsif field[:link]
+      link_to(value, eval("#{field[:link]}('#{object.id}')"))
+    else
+      value
+    end
   end
 
 end
\ No newline at end of file
diff --git a/app/views/admin/default_index/_clear_filters.html.erb b/app/views/admin/default_index/_clear_filters.html.erb
new file mode 100644
index 000000000..d8ff1784a
--- /dev/null
+++ b/app/views/admin/default_index/_clear_filters.html.erb
@@ -0,0 +1,3 @@
+<div class="filter-clear">
+  <%= link_to content_tag(:i, nil, :class => 'icons-cycle') + t(:clear), url_for(:filter => @filter, :sort => params[:sort], :direction => params[:direction], :clear => true, :type => type), :class => "btn btn-link btn-small" %>
+</div>
\ No newline at end of file
diff --git a/app/views/admin/default_index/_filter_categories.html.erb b/app/views/admin/default_index/_filter_categories.html.erb
new file mode 100644
index 000000000..797f7224c
--- /dev/null
+++ b/app/views/admin/default_index/_filter_categories.html.erb
@@ -0,0 +1,6 @@
+<div class="accordion-inner pagination-right" data-toggle="buttons-checkbox">
+  <% @categories.each do |category| -%>
+    <%= link_to category.title, url_for(:filter => @filter, :new_filter => {:type => 'categories', :id => category.id}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn btn-small #{is_filter_active?('categories', category.id)}" %>
+  <% end -%> 
+</div>
+<%= render :partial => 'admin/default_index/clear_filters', :locals => {:type => 'categories'} %>
\ No newline at end of file
diff --git a/app/views/admin/default_index/_filter_status.html.erb b/app/views/admin/default_index/_filter_status.html.erb
new file mode 100644
index 000000000..3c5c0b2dd
--- /dev/null
+++ b/app/views/admin/default_index/_filter_status.html.erb
@@ -0,0 +1,9 @@
+<div class="accordion-inner pagination-right" data-toggle="buttons-checkbox">
+  <%= link_to t(:top), url_for(:filter => @filter, :new_filter => {:type => 'status', :id => 'is_top'}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn btn-small #{is_filter_active?('status', 'is_top')}" %>
+  <%= link_to t(:hot), url_for(:filter => @filter, :new_filter => {:type => 'status', :id => 'is_hot'}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn btn-small #{is_filter_active?('status', 'is_hot')}" %>
+  <%= link_to t(:hidden), url_for(:filter => @filter, :new_filter => {:type => 'status', :id => 'is_hidden'}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn btn-small #{is_filter_active?('status', 'is_hidden')}" unless(is_guest?)%>
+  <%= link_to t(:pending), url_for(:filter => @filter, :new_filter => {:type => 'status', :id => 'is_pending'}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn btn-small #{is_filter_active?('status', 'is_pending')}"  if(is_manager?)%>
+  <%= link_to t(:passed), url_for(:filter => @filter, :new_filter => {:type => 'status', :id => 'is_checked'}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn btn-small #{is_filter_active?('status', 'is_checked')}" if(is_manager?)%>
+  <%= link_to t(:rejected), url_for(:filter => @filter, :new_filter => {:type => 'status', :id => 'is_rejected'}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn btn-small #{is_filter_active?('status', 'is_rejected')}" if(is_manager?)%>
+</div>
+<%= render :partial => 'admin/default_index/clear_filters', :locals => {:type => 'status'} %>
diff --git a/app/views/admin/default_index/_filter_tags.html.erb b/app/views/admin/default_index/_filter_tags.html.erb
new file mode 100644
index 000000000..a9657e890
--- /dev/null
+++ b/app/views/admin/default_index/_filter_tags.html.erb
@@ -0,0 +1,6 @@
+<div class="accordion-inner pagination-right" data-toggle="buttons-checkbox">
+  <% @tags.each do |tag| -%>
+    <%= link_to tag.name, url_for(:filter => @filter, :new_filter => {:type => 'tags', :id => tag.id}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn btn-small #{is_filter_active?('tags', tag.id)}" %>
+  <% end -%> 
+</div>
+<%= render :partial => 'admin/default_index/clear_filters', :locals => {:type => 'tags'} %>
\ No newline at end of file
diff --git a/app/views/admin/default_index/_index.html.erb b/app/views/admin/default_index/_index.html.erb
new file mode 100644
index 000000000..5fe5e4349
--- /dev/null
+++ b/app/views/admin/default_index/_index.html.erb
@@ -0,0 +1,68 @@
+<% content_for :page_specific_javascript do %>
+  <%= javascript_include_tag "lib/modal-preview" if @approvable %>
+  <script>
+    $(document).ready(function(){
+      $('.reject_info').tooltip({
+        placement : 'bottom'
+      });
+    });
+  </script>
+<% end %>
+
+<% content_for :right_nav do %>
+<!--   <div class="pull-right">
+    <input id="filter-input" class="search-query input-medium" type="text" placeholder="<%= t(:search_) %>" value="">
+  </div> -->
+  <% if @filterable %>
+    <ul class="nav nav-pills filter-nav pull-right">
+      <li class="accordion-group">
+        <div class="accordion-heading">
+          <a href="#collapse-status" data-toggle="collapse" data-parent="#filter" class="accordion-toggle"><%= t(:status) %></a>
+        </div>
+      </li>
+      <li class="accordion-group">
+        <div class="accordion-heading">
+          <a href="#collapse-category" data-toggle="collapse" data-parent="#filter" class="accordion-toggle"><%= t(:categories) %></a>
+        </div>
+      </li>
+      <li class="accordion-group">
+        <div class="accordion-heading">
+          <a href="#collapse-tags" data-toggle="collapse" data-parent="#filter" class="accordion-toggle"><%= t(:tags) %></a>
+        </div>
+      </li>
+    </ul>
+    <div class="filter-group accordion-group">
+      <div class="accordion-body collapse" id="collapse-status">
+        <%= render 'admin/default_index/filter_status' %>
+      </div>
+      <div class="accordion-body collapse" id="collapse-category">
+        <%= render 'admin/default_index/filter_categories' %>
+      </div>
+      <div class="accordion-body collapse" id="collapse-tags">
+        <%= render 'admin/default_index/filter_tags' %>
+      </div>
+    </div>
+  <% end %>
+<% end %>
+
+<%= index_table %>
+
+<%= @index_footer %>
+
+
+<div id="delete_tags" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+  <div class="modal-header">
+    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+    <h3 id="myModalLabel"><%= t('tag.delete') %></h3>
+  </div>
+  <div class="modal-body tags">
+    <span class="text-warning text-center"><%= t('tag.warning.delete') %></span>
+    <hr>
+    <ul class="tags-groups checkbox-card">
+    </ul>
+  </div>
+  <div class="modal-footer">
+    <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
+    <%= link_to t(:delete_), nil, class: "delete-tags btn btn-danger", method: :post, remote: true %>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/admin/tags/index.html.erb b/app/views/admin/tags/index.html.erb
index c0ac9b508..19682dbdb 100644
--- a/app/views/admin/tags/index.html.erb
+++ b/app/views/admin/tags/index.html.erb
@@ -1,3 +1,9 @@
+<% content_for :right_nav do %>
+  <div class="pull-right">
+    <input id="filter-input" class="search-query input-medium" type="text" placeholder="<%= t('search.tags') %>" value="">
+  </div>
+<% end %>
+
 <div id="tags_index">
   <%= render 'index' %>
 </div>
diff --git a/app/views/layouts/back_end.html.erb b/app/views/layouts/back_end.html.erb
index 8db541d8b..dbd89501a 100644
--- a/app/views/layouts/back_end.html.erb
+++ b/app/views/layouts/back_end.html.erb
@@ -6,10 +6,10 @@
 	<%= render 'layouts/google_font' %>
 	<%= stylesheet_link_tag "back_end" %>
 	<%= stylesheet_link_tag params[:controller] %>
+  <%= yield :page_specific_css %>
 	<%= render 'layouts/ie_html5_fix' %>
 	<%= javascript_include_tag "back_end" %>
 	<%= javascript_include_tag params[:controller] %>
-	<%= yield :page_specific_css %>
 	<%= yield :page_specific_javascript %>
 	<%= csrf_meta_tag %>
 </head>
@@ -27,10 +27,7 @@
           <li><a href="/orbit_4.0.1/admin/dashboards/dashboards.shtml">Dashboard</a> <span class="divider">/</span></li>
           <li class="active">All</li>
         </ul>
-
-        <div class="pull-right">
-          <input id="filter-input" class="search-query input-medium" type="text" placeholder="Search Tags" value="">
-        </div>
+        <%= yield :right_nav %>
       </div>
     	<%= yield %>
       <div id="pageslide">
diff --git a/config/locales/new_ui.en.yml b/config/locales/new_ui.en.yml
index 24c843dc6..61aa9b215 100644
--- a/config/locales/new_ui.en.yml
+++ b/config/locales/new_ui.en.yml
@@ -1,22 +1,37 @@
 en:
+  add_category: Add category
   add_link: Add link
   add_page: Add page
   add_to_default: Add to default
+  alternative: Alternative
+  change: Change
   create:
     error:
-      tag: Error when creating tag.
+      category: Error when creating category
+      tag: Error when creating tag
   deselect_all: Deselect all
+  detail: Detail
+  edit_category: Edit Categorie
   editing:
     tag: Editing tag
+  file:
+    name: File name
+  language: Language
   login_orbit: Log In to Orbit
   merge: Merge
   new:
     tag: New tag
   next: Next
   no_app: No module
+  no_date: No date
   previous: Previous
+  remove: Remove
   remove_default: Remove default
+  search:
+    tags: Search tags
   select_all: Select all
+  select_file: Select file
+  select_image: Select image
   tag:
     add: Add tag
     delete: Delete tags
@@ -29,4 +44,6 @@ en:
       remove_default: Are you sure you want to remove the default tags?
   update:
     error:
-      tag: Error when updating tag.
\ No newline at end of file
+      tag: Error when updating category
+      tag: Error when updating tag
+  url_alt: Alternative text
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
index 91f458c81..732e85c02 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
@@ -17,18 +17,49 @@ class Panel::Announcement::BackEnd::BulletinCategorysController < OrbitBackendCo
   before_filter :for_app_sub_manager,:except => [:index,:get_categorys_json,:get_bulletins_json]
 
   def index
-    @bulletin_categorys = get_categories_for_index("BulletinCategory")
+    @bulletin_categorys = get_categories_for_index("BulletinCategory").page(params[:page]).per(10)
     #TODO 需要做 manager ,admin 才可以 all.  其他 available就好
     @bulletin_category = BulletinCategory.new(:display => 'List')
-    @url = panel_announcement_back_end_bulletin_categorys_path
+  end
 
-    respond_to do |format|
-      format.html # index.html.erb
-      # format.xml  { render :xml => @bulletins }
-      format.js
+  def new
+    @bulletin_category = BulletinCategory.new(:display => 'List')
+    render layout: false
+  end
+
+  def edit
+    @bulletin_category = BulletinCategory.find(params[:id])
+    render layout: false
+  end
+
+  def create
+    @bulletin_category = BulletinCategory.new(params[:bulletin_category])
+    if @bulletin_category.save
+      redirect_to action: :index
+    else
+      @bulletin_category = BulletinCategory.new(params[:module_tag])
+      flash.now[:error] = t('create.error.category')
+      render action: :new
     end
   end
 
+  def update
+    @bulletin_category = BulletinCategory.find(params[:id])
+    if @bulletin_category.update_attributes(params[:bulletin_category])
+      redirect_to action: :index
+    else
+      flash.now[:error] = t('update.error.category')
+      render action: :edit
+    end
+  end
+
+  def toggle
+    @bulletin_category = BulletinCategory.find(params[:id])
+    @bulletin_category.disable = @bulletin_category.disable ? false : true
+    @bulletin_category.save! 
+    redirect_to action: :index 
+  end
+
   def get_categorys_json
     categorys = BulletinCategory.all
     data = Array.new
@@ -78,113 +109,4 @@ class Panel::Announcement::BackEnd::BulletinCategorysController < OrbitBackendCo
 
     render :json => JSON.pretty_generate(data)
   end
-
-  # GET /bulletins/1
-  # GET /bulletins/1.xml
-  def show
-    @bulletin_category = BulletinCategory.find(params[:id])
-
-    respond_to do |format|
-      format.html # show.html.erb
-      # format.xml  { render :xml => @bulletin_category }
-      format.js
-    end
-  end
-
-  # GET /bulletins/new
-  # GET /bulletins/new.xml
-  def new
-    @bulletin_category = BulletinCategory.new(:display => 'List')
-
-    respond_to do |format|
-      format.html # new.html.erb
-      # format.xml  { render :xml => @bulletin_category }
-      format.js
-    end
-  end
-
-  def quick_edit
-    # debugger
-
-    @bulletin_category = BulletinCategory.find(params[:bulletin_category_id])
-
-    @url = panel_announcement_back_end_bulletin_category_path(@bulletin_category)
-
-    respond_to do |format|
-      format.js
-    end
-
-  end
-
-  # GET /bulletins/1/edit
-  def edit
-    @bulletin_category = BulletinCategory.find(params[:id])
-
-    @url = panel_announcement_back_end_bulletin_category_path(@bulletin_category)
-
-    respond_to do |format|
-      format.html
-      format.js
-    end
-  end
-
-  # POST /bulletins
-  # POST /bulletins.xml
-  def create
-    @bulletin_category = BulletinCategory.new(params[:bulletin_category])
-
-    respond_to do |format|
-      if @bulletin_category.save
-        # format.html { redirect_to @bulletin_category, notice: 'Entry was successfully created.' }
-        format.html { redirect_to(panel_announcement_back_end_bulletin_categorys_url, :notice => t('announcement.create_bulletin_category_success')) }
-        # format.xml  { render :xml => @bulletin_category, :status => :created, :location => @bulletin_category }
-        format.js
-      else
-        format.html { render :action => "new" }
-        # format.xml  { render :xml => @bulletin_category.errors, :status => :unprocessable_entity }
-        format.js { render action: "new" }
-      end
-    end
-  end
-
-  # PUT /bulletins/1
-  # PUT /bulletins/1.xml
-  def update
-    @bulletin_category = BulletinCategory.find(params[:id])
-
-    @url = panel_announcement_back_end_bulletin_category_path(@bulletin_category)
-
-    respond_to do |format|
-      if @bulletin_category.update_attributes(params[:bulletin_category])
-        # format.html { redirect_to(panel_announcement_back_end_bulletin_category_url(@bulletin_category), :notice => t('announcement.update_bulletin_category_success')) }
-        # format.html { redirect_to(panel_announcement_back_end_bulletin_categorys_url, :notice => t('announcement.update_bulletin_category_success')) }
-        # format.xml  { head :ok }
-        format.js
-      else
-        format.html { render :action => "edit" }
-        format.js { render :action => "edit" }
-        # format.xml  { render :xml => @bulletin_category.errors, :status => :unprocessable_entity }
-      end
-    end
-  end
-
-  # DELETE /bulletins/1
-  # DELETE /bulletins/1.xml
-  def destroy
-    @bulletin_category = BulletinCategory.find(params[:id])
-    @bulletin_category.disable = @bulletin_category.disable ? false : true
-
-    if @bulletin_category.save! 
-      respond_to do |format|
-        flash[:notice] = t("update.success_")
-        # flash[:error] +=  @bulletin_category.disable ?  t(:enable) : t(disable)
-        format.html { redirect_to(panel_announcement_back_end_bulletin_categorys_url) }
-        # format.xml  { head :ok }
-        format.js 
-      end
-    else
-      flash[:error] = t("update.fail")
-      format.html { render :action => "index" }
-    end
-  end
 end
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
index e45ced1d6..e059b8c75 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
@@ -110,59 +110,36 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
   # POST /bulletins.xml
   def create
     @tags = get_tags
-    if params[:bulletin_link]
+    @bulletin = Bulletin.new(params[:bulletin])
+    @bulletin.deadline = nil if (@bulletin.deadline < @bulletin.postdate rescue nil)
 
-      @bulletin_link = BulletinLink.new(params[:bulletin_link])
+    @bulletin.create_user_id = current_user.id
+    @bulletin.update_user_id = current_user.id
+    if(is_manager? || is_admin?)
+      @bulletin.is_checked = true
+      @bulletin.is_rejected = false
+      @bulletin.de_pending
+    end
 
-      respond_to do |format|
-        if @bulletin_link.save
-          format.js { render 'create_bulletin_link' }
-        end
-      end
+    respond_to do |format|
+      if @bulletin.save
 
-    elsif params[:bulletin_file]
-
-      @bulletin_file = BulletinFile.new(params[:bulletin_file])
-
-      respond_to do |format|
-        if @bulletin_file.save
-          format.js { render 'create_bulletin_file' }
-        end
-      end
-
-    else
-
-      @bulletin = Bulletin.new(params[:bulletin])
-      @bulletin.deadline = nil if (@bulletin.deadline < @bulletin.postdate rescue nil)
-
-      @bulletin.create_user_id = current_user.id
-      @bulletin.update_user_id = current_user.id
-      if(is_manager? || is_admin?)
-        @bulletin.is_checked = true
-        @bulletin.is_rejected = false
-        @bulletin.de_pending
-      end
-
-      respond_to do |format|
-        if @bulletin.save
-
-          format.html { redirect_to(panel_announcement_back_end_bulletins_url, :notice => t('announcement.create_bulletin_success')) }
-          format.xml  { render :xml => @bulletin, :status => :created, :location => @bulletin }
-          # format.js
-          format.js { 
-            @info = {"success"=>"true","redirect_url"=>panel_announcement_back_end_bulletins_url}
-            flash[:notice] = t('bulletin.create_bulletin_success')
-            render "/shared/preview/after_create.js.erb"
-          }
-        else
-          format.html { render :action => "new" }
-          format.xml  { render :xml => @bulletin.errors, :status => :unprocessable_entity }
-          format.js { 
-            @info = {"success"=>"false","redirect_url"=>new_panel_announcement_back_end_bulletin_url(:bulletin => @bulletin)}
-            session[:in_validate_object] = @bulletin
-            render "/shared/preview/after_create.js.erb"
-          }
-        end
+        format.html { redirect_to(panel_announcement_back_end_bulletins_url, :notice => t('announcement.create_bulletin_success')) }
+        format.xml  { render :xml => @bulletin, :status => :created, :location => @bulletin }
+        # format.js
+        format.js { 
+          @info = {"success"=>"true","redirect_url"=>panel_announcement_back_end_bulletins_url}
+          flash[:notice] = t('bulletin.create_bulletin_success')
+          render "/shared/preview/after_create.js.erb"
+        }
+      else
+        format.html { render :action => "new" }
+        format.xml  { render :xml => @bulletin.errors, :status => :unprocessable_entity }
+        format.js { 
+          @info = {"success"=>"false","redirect_url"=>new_panel_announcement_back_end_bulletin_url(:bulletin => @bulletin)}
+          session[:in_validate_object] = @bulletin
+          render "/shared/preview/after_create.js.erb"
+        }
       end
     end
   end
diff --git a/vendor/built_in_modules/announcement/app/models/bulletin_category.rb b/vendor/built_in_modules/announcement/app/models/bulletin_category.rb
index 9eb3cfbef..56c335e96 100644
--- a/vendor/built_in_modules/announcement/app/models/bulletin_category.rb
+++ b/vendor/built_in_modules/announcement/app/models/bulletin_category.rb
@@ -19,6 +19,8 @@ class BulletinCategory
   field :title, localize: true
   
   has_many :bulletins
+
+  validates :title, :at_least_one => true
   
   def pp_object
     title
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb
index bf4e717c0..281847c55 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb
@@ -1,20 +1,20 @@
-
-	<tr id="<%= dom_id bulletin_category %>" class="with_action">
+<tr class="<%= 'disable' if bulletin_category.disable %>">
+  <% @site_valid_locales.each_with_index do |locale, i| %>
 		<td>
-			<%= bulletin_category.key %>
-			<div class="quick-edit">
-				<ul class="nav nav-pills hide">
-					<% if is_admin?%>
-						<li><%= link_to t(:edit), edit_panel_announcement_back_end_bulletin_category_path(bulletin_category), :remote => true %></li>
-						<li><%= link_to show_toggle_archive_btn(bulletin_category) , panel_announcement_back_end_bulletin_category_path(bulletin_category), :confirm => t(:sure?), :method => :delete, :remote => true,:class=> "archive_toggle" %></li>
-					<% end %>
-					<%if is_manager? || is_admin? %>
-						<li><%= show_anc_cate_permission_link(bulletin_category) %></li>
-					<% end %>
-				</ul>
-			</div>
+			<%= bulletin_category.title_translations[locale] %>
+			<% if i == 0 %>
+	      <div class="quick-edit">
+          <ul class="nav nav-pills">
+          	<% if is_admin?%>
+	            <li><%= link_to t(:edit), edit_panel_announcement_back_end_bulletin_category_path(bulletin_category), class: "open-slide" %></li>
+	            <li><%= link_to show_toggle_archive_btn(bulletin_category) , toggle_panel_announcement_back_end_bulletin_category_path(bulletin_category), method: :post, remote: true, class: "archive_toggle" %></li>
+	           <% end %>
+            <% if is_manager? || is_admin? %>
+							<li><%= show_anc_cate_permission_link(bulletin_category) %></li>
+						<% end %>
+          </ul>
+        </div>
+			<% end %>
 		</td>
-		<% @site_valid_locales.each do |locale| %>
-		<td><%= bulletin_category.title_translations[locale] rescue nil %></td>
-		<% end %>
-	</tr>
+	<% end %>
+</tr>
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_edit.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_edit.html.erb
new file mode 100644
index 000000000..cfbe07927
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_edit.html.erb
@@ -0,0 +1,10 @@
+<%= form_for @bulletin_category, :url => panel_announcement_back_end_bulletin_category_path(@bulletin_category), remote: true do |f| %>
+  <fieldset>
+    <legend><%= t(:edit_category) %></legend>
+    <%= render :partial => 'form', :locals => {:f => f} %>
+  </fieldset>
+  <div class="form-actions">
+    <a href="javascript:$.pageslide.close()" class="btn btn-small"><%= t(:cancel) %></a>
+    <%= f.submit t(:update_), class: 'btn btn-primary btn-small' %>
+  </div>
+<% end %>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_form.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_form.html.erb
index 9c9880b8e..92f3403e6 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_form.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_form.html.erb
@@ -1,37 +1,9 @@
-<% # encoding: utf-8 %>
+<%= flash_messages %>
+<%= f.error_messages %>
 
-<%= form_for(@bulletin_category, :remote => true, :url => @url) do |f| %>
-
-	<h2><%= @bulletin_category.new_record? ? t(:add) : t(:edit) %></h2>
-
-	<div id="widget-title">
-		<%= f.label :key, t(:key) %>
-		<%= f.text_field :key %>
-	</div>
-	
-	<div id="widget-title">
-		<%= f.fields_for :title_translations do |f| %>
-		  <% @site_valid_locales.each do |locale| %>
-				<div class="control-group">
-					<%= label_tag "name-#{locale}", "#{t(:name)}-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
-					<div class="controls">
-						<%= f.text_field locale, :class => 'input-xxlarge', :value => (@bulletin_category.title_translations[locale] rescue nil) %>
-					</div>
-				</div>
-		  <% end %>
-		<% end %>
-	</div>
-	
-	<div id="widget-title">
-		<%#= f.label :display %>
-		<%#= f.radio_button :display, "List" List%>
-		<%#= f.radio_button :display, "Picture" Picture%>
-		<%# <br />顯示方式是設定在前台頁面時，資訊所呈現的樣式 %>
-	</div>
-  
-  <div class="form-actions pagination-right">
-    <%= f.submit t('submit'), :class=>'btn btn-primary' %>
-  </div>
-  
+<%= f.fields_for :title_translations do |f| %>
+  <% @site_valid_locales.each do |locale| %>
+		<%= label_tag "name-#{locale}", "#{t(:name)} (#{I18nVariable.from_locale(locale)})" %>
+		<%= f.text_field locale, :class => 'input-large', :value => (@bulletin_category.title_translations[locale] rescue ''), placeholder: t(:name) %>
+  <% end %>
 <% end %>
- 
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_index.html.erb
new file mode 100644
index 000000000..9fd43a1ae
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_index.html.erb
@@ -0,0 +1,21 @@
+<table class="table main-list">
+  <thead>
+    <tr class="sort-header">
+      <% @site_valid_locales.each do |locale| %>
+        <th><a href="#"><%= t(:_locale, :locale => locale) %></a></th>
+      <% end %>
+    </tr>
+  </thead>
+  <tbody>
+    <%= render :partial => 'bulletin_category', :collection => @bulletin_categorys %>
+  </tbody>
+</table>
+
+<div class="bottomnav clearfix">
+  <div class="action pull-right">
+    <%= link_to content_tag(:i, nil, class: "icons-plus") + " " + t(:add), new_panel_announcement_back_end_bulletin_category_path, class: "btn btn-primary open-slide" %>
+  </div>
+  <div class="pagination pagination-centered">
+    <%= paginate @bulletin_categorys %>
+  </div>
+</div>
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_new.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_new.html.erb
new file mode 100644
index 000000000..195092cc1
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_new.html.erb
@@ -0,0 +1,10 @@
+<%= form_for @bulletin_category, :url => panel_announcement_back_end_bulletin_categorys_path, remote: true do |f| %>
+  <fieldset>
+    <legend><%= t(:add_category) %></legend>
+    <%= render :partial => 'form', :locals => {:f => f} %>
+  </fieldset>
+  <div class="form-actions">
+    <a href="javascript:$.pageslide.close()" class="btn btn-small"><%= t(:cancel) %></a>
+    <%= f.submit t(:create_), class: 'btn btn-primary btn-small' %>
+  </div>
+<% end %>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/create.js.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/create.js.erb
deleted file mode 100644
index e914aacdc..000000000
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/create.js.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-$('<%= j render :partial => 'bulletin_category', :collection => [@bulletin_category] %>').appendTo('#bulletin_categorys').hide().fadeIn();
-$("#new_bulletin_category")[0].reset();
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/destroy.js.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/destroy.js.erb
deleted file mode 100644
index e7f791906..000000000
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/destroy.js.erb
+++ /dev/null
@@ -1 +0,0 @@
-$("#<%= dom_id @bulletin_category %>").find(".archive_toggle").text("<%= show_toggle_archive_btn(@bulletin_category) %>  ");
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/edit.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/edit.html.erb
index 29e4515ba..9e91e9ef2 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/edit.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/edit.html.erb
@@ -1,7 +1 @@
-<h1><%= t('announcement.editing_announcement_category') %></h1>
-
-<%= form_for @bulletin_category, :url => panel_announcement_back_end_bulletin_category_path(@bulletin_category) do |f| %>
-	<%= render :partial => 'form', :locals => {:f => f} %>
-<% end %>
-
-<%= link_back %>
+<%= render 'edit' %>
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/edit.js.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/edit.js.erb
index eaff01fa3..30d88e18a 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/edit.js.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/edit.js.erb
@@ -1 +1 @@
-$("#form > form").replaceWith("<%= j render "form" %>");
\ No newline at end of file
+$('#view-page .content').html("<%= j render 'edit' %>");
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/index.html.erb
index cc9dbd9e8..c4c84ca7f 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/index.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/index.html.erb
@@ -1,41 +1,3 @@
-
-<%= flash_messages %>
-
-<div id="filter" class="subnav">
-	<div class="filters">
-		<div id="sort_headers" class="table-label">
-			<table class="table main-list">	
-				<thead>
-					<tr>
-						<th class="span2"><%= t(:key) %></th>
-						<% @site_valid_locales.each do |locale| %>
-						<th class="span2"><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></th>
-						<% end %>
-					</tr>
-				</thead>
-			</table>
-		</div>
-	</div>
-</div>
-
-
-<table id="bulletin_categorys" class="table main-list">
-	<thead>
-		<tr>
-			<th class="span2"></th>
-			<% @site_valid_locales.each do |locale| %>
-			<th class="span2"></th>
-			<% end %>
-		</tr>
-	</thead>
-	<tbody>
-
-	<%= render :partial => 'bulletin_category', :collection => @bulletin_categorys %>
-	
-	</tbody>
-</table>
-
-<div id="form"><%= render :partial => "form" if is_manager?%></div>
-
-
-
+<div id="categories_index">
+	<%= render 'index' %>
+</div>
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/index.js.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/index.js.erb
new file mode 100644
index 000000000..641d1fa74
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/index.js.erb
@@ -0,0 +1,3 @@
+$("#categories_index").html("<%= j render 'index' %>")
+$.pageslide.close();
+openSlide();
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/new.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/new.html.erb
index e401b5284..e3355a939 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/new.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/new.html.erb
@@ -1,19 +1 @@
-<% content_for :secondary do %>
-<%= render :partial => '/panel/announcement/back_end/announcement_secondary' %>
-<% end -%>
-
-<%= flash_messages %>
-
-<br />
-<br />
-<br />
-<br />
-<br />
-
-<h1><%= t('announcement.new_bulletin_category') %></h1>
-<%= form_for @bulletin_category, :url => panel_announcement_back_end_bulletin_categorys_path do |f| %>
-	<%= render :partial => 'form', :locals => {:f => f} %>
-<% end %>
-
-<%= link_back %>
-
+<%= render 'new' %>
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/new.js.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/new.js.erb
index 40061b9fc..5ecf8f163 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/new.js.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/new.js.erb
@@ -1 +1 @@
-$("#form > form").replaceWith("<%= j render "form" %>");
+$('#view-page .content').html("<%= j render 'new' %>");
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/update.js.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/update.js.erb
deleted file mode 100644
index 728757e3c..000000000
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/update.js.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-$("#<%= dom_id @bulletin_category %>").replaceWith("<%= j render :partial => 'bulletin_category', :collection => [@bulletin_category] %>");
-<% @bulletin_category = BulletinCategory.new(:display => 'List') # reset for new form %>
-$(".edit_bulletin_category").replaceWith("<%= j render "form" %>")
-$(".new_bulletin_category")[0].reset();
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_file_qe.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_file_qe.html.erb
deleted file mode 100644
index b9270dbe3..000000000
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_file_qe.html.erb
+++ /dev/null
@@ -1,51 +0,0 @@
-<% # encoding: utf-8 %>
-
-		<%= form_for @bulletin_file, :url => @file_url, :html => {:id => 'ajaxForm', :multipart => true} do |f| %>
-        
-            <div class="modal-header">
-                <a class="close" data-dismiss="modal">×</a>
-                <h3><%= (@bulletin_file.new_record? ? t(:add) : t(:edit)) %></h3>
-            </div>
-            <div class="modal-body form-horizontal">
-				<div class="control-group">
-					<div class="controls">
-					<%= f.file_field :file %>
-					</div>
-				</div>
-				
-				<%= f.fields_for :title_translations do |f| %>
-				  <% @site_valid_locales.each do |locale| %>
-					<div class="control-group">
-						<label for="file-<%= locale %>" class="control-label"><%= t(:name) %> <%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></label>
-						<div class="controls">
-						<%= f.text_field locale, :id => "file-#{locale}", :class => "input-xlarge", :value => (@bulletin_file.title_translations[locale] rescue nil)  %>
-						</div>
-					</div>
-				  <% end %>
-				<% end %>	
-				
-				<%= f.fields_for :description_translations do |f| %>
-				  <% @site_valid_locales.each do |locale| %>
-					<div class="control-group">
-						<label for="file-<%= locale %>" class="control-label"><%= t(:description) %> <%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></label>
-						<div class="controls">
-						<%= f.text_field locale, :id => "file-#{locale}", :class => "input-xlarge", :value => (@bulletin_file.description_translations[locale] rescue nil) %>
-						</div>
-					</div>
-				  <% end %>
-				<% end %>
-				
-            </div>
-			
-            <div class="modal-footer">
-							<%= hidden_field_tag 'bulletin_file[bulletin_id]', @bulletin_file.bulletin_id %>
-        			<a class="btn btn-primary" id='ajax_form_submit'><%= t('submit')%></a>
-               <a class="btn" data-dismiss="modal"><%= t('cancel')%></a>
-				
-            </div>
-
-		
-		<% end %>
-		
-
- 		
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link_qe.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link_qe.html.erb
deleted file mode 100644
index de7567a57..000000000
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin_link_qe.html.erb
+++ /dev/null
@@ -1,36 +0,0 @@
-<% # encoding: utf-8 %>
-
-<%= form_for(@bulletin_link, :remote => true, :url => @link_url) do |f| %>
-    
-	<div class="modal-header">
-	  <a class="close" data-dismiss="modal">×</a>
-	  <h3><%= (@bulletin_link.new_record? ? t(:add) : t(:edit)) %></h3>
-	</div>
-	<div class="modal-body form-horizontal">
-	  <div class="control-group">
-	    <label for="http" class="control-label"><%= t(:url) %></label>
-	    <div class="controls">
-			<%= f.text_field :url %>
-	  </div>
-	</div>
-
-	<%= f.fields_for :title_translations do |f| %>
-		<% @site_valid_locales.each do |locale| %>
-			<div class="control-group">
-				<%= label_tag "link-#{locale}", "#{t(:name)}-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
-				<div class="controls">
-					<%#= f.text_field locale, :class => 'input-xxlarge' %>
-					<%= f.text_field locale, :class => 'control-label', :value => (@bulletin_link.title_translations[locale] rescue nil) %>
-				</div>
-			</div>
-		<% end %>
-	<% end %>
-	</div>
-	<div class="modal-footer">
-		<%= hidden_field_tag 'bulletin_link[bulletin_id]', @bulletin_link.bulletin_id %>
-		<%= f.submit t('submit'), :class=>'btn btn-primary' %>
-	  <a class="btn" data-dismiss="modal"><%= t('cancel')%></a>
-<% end %>
-		
-
- 		
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletins.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletins.html.erb
deleted file mode 100644
index 778340ec6..000000000
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletins.html.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<thead>
-	<tr>
-	    <th class="span1"></th>
-	    <th class="span1-2"></th>
-	    <th class="span1-2"></th>
-	    <th class="span7"></th>
-	    <th class="span1-2"></th>
-	    <th class="span1-2"></th>
-	    <th class="span1-2"></th>
-	    <th class="span1-3"></th>
-	</tr>
-</thead>
-<tbody id="tbody_bulletins" class="sort-holder">
-	<%= render :partial => 'bulletin', :collection => @bulletins %>
-</tbody>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_clear_filters.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_clear_filters.html.erb
deleted file mode 100644
index 465e0ce5c..000000000
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_clear_filters.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="filter-clear">
-	<%= link_to content_tag(:i, nil, :class => 'icons-cycle') + t(:clear), panel_announcement_back_end_bulletins_path(:filter => @filter, :sort => params[:sort], :direction => params[:direction], :clear => true, :type => type), :class => "btn btn-small js_history" %>
-</div>
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_file.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_file.html.erb
deleted file mode 100644
index 7d0445ada..000000000
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_file.html.erb
+++ /dev/null
@@ -1,37 +0,0 @@
-	<div id='add_bulletin_files'>
-	
-	<% bulletin_files.each do | bulletin_file | %>
-		
-		<%= fields_for 'bulletin[bulletin_files][]', bulletin_file, :index => nil do |f| %>
-	
-		<div  id="<%= "bulletin_#{bulletin_file.id}" if !bulletin_file.new_record? %>" class='list_item'>
-		  <div class="field">
-			<%= f.label :file  %>
-			<%#= file_field_tag 'bulletin[file]' %>
-			<%= f.file_field :file %>
-
-			<%= f.label :file_title %>
-			<%= f.text_field :title %>
-
-			<%= f.label :file_description %>
-			<%= f.text_field :description %>
-
-			<span class="action">
-			<% if bulletin_file.new_record? %>
-			  <a href="#" class="delete"><%= t(:delete_) %></a>
-			<% else %>	
-			  <%= f.hidden_field :id %>
-				<% if bulletin_file.is_built_in? %>
-					<a href="#" class="switch" id="<%= bulletin_file.id %>"></a>
-				<% else %>
-					<a href="#" class="remove_existing_record"><%= t(:delete_) %></a>
-					<%= f.hidden_field :_destroy, :value => nil, :class => 'should_destroy' %>
-				<% end %>
-			<% end %>
-			</span>
-		  </div>
-		</div>
-		<% end %>
-		
-	<% end %>
-		</div>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter_categories.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter_categories.html.erb
deleted file mode 100644
index 4884aada9..000000000
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter_categories.html.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="accordion-inner" data-toggle="buttons-checkbox">
-	<% @bulletin_categories.each do |category| -%>
-		<%= link_to category.title, panel_announcement_back_end_bulletins_path(:filter => @filter, :new_filter => {:type => 'categories', :id => category.id}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn btn-small js_history#{is_filter_active?('categories', category.id)}" %>
-	<% end -%> 
-</div>
-<%= render :partial => 'clear_filters', :locals => {:type => 'categories'} %>
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter_status.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter_status.html.erb
deleted file mode 100644
index ba9a620b5..000000000
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter_status.html.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="accordion-inner" data-toggle="buttons-checkbox">
-	<%= link_to t(:top), panel_announcement_back_end_bulletins_path(:filter => @filter, :new_filter => {:type => 'status', :id => 'is_top'}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn btn-small js_history#{is_filter_active?('status', 'is_top')}" %>
-	<%= link_to t(:hot), panel_announcement_back_end_bulletins_path(:filter => @filter, :new_filter => {:type => 'status', :id => 'is_hot'}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn btn-small js_history#{is_filter_active?('status', 'is_hot')}" %>
-	<%= link_to t(:hidden), panel_announcement_back_end_bulletins_path(:filter => @filter, :new_filter => {:type => 'status', :id => 'is_hidden'}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn btn-small js_history#{is_filter_active?('status', 'is_hidden')}" unless(is_guest?)%>
-	<%= link_to t(:pending), panel_announcement_back_end_bulletins_path(:filter => @filter, :new_filter => {:type => 'status', :id => 'is_pending'}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn btn-small js_history#{is_filter_active?('status', 'is_pending')}"  if(is_manager?)%>
-	<%= link_to t(:passed), panel_announcement_back_end_bulletins_path(:filter => @filter, :new_filter => {:type => 'status', :id => 'is_checked'}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn btn-small js_history#{is_filter_active?('status', 'is_checked')}" if(is_manager?)%>
-	<%= link_to t(:rejected), panel_announcement_back_end_bulletins_path(:filter => @filter, :new_filter => {:type => 'status', :id => 'is_rejected'}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn btn-small js_history#{is_filter_active?('status', 'is_rejected')}" if(is_manager?)%>
-</div>
-<%= render :partial => 'clear_filters', :locals => {:type => 'status'} %>
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter_tags.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter_tags.html.erb
deleted file mode 100644
index c01e9f536..000000000
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter_tags.html.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="accordion-inner" data-toggle="buttons-checkbox">
-	<% @tags.each do |tag| -%>
-		<%= link_to tag.name, panel_announcement_back_end_bulletins_path(:filter => @filter, :new_filter => {:type => 'tags', :id => tag.id}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn btn-small js_history#{is_filter_active?('tags', tag.id)}" %>
-	<% end -%> 
-</div>
-<%= render :partial => 'clear_filters', :locals => {:type => 'tags'} %>
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
index 289608773..2b2f7311f 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
@@ -1,305 +1,290 @@
-<% # encoding: utf-8 %>
-<% content_for :page_specific_javascript do -%>
-	<%= javascript_include_tag "inc/modal-preview" %>
-<% end -%>
-	<!--Widget start-->
-	<%= f.error_messages %>
-	
-	<div id="sub-wiget">
+<% content_for :page_specific_css do %>
+  <%= stylesheet_link_tag "lib/main-forms" %>
+  <%= stylesheet_link_tag "lib/fileupload" %>
+<% end %>
+<% content_for :page_specific_javascript do %>
+  <%= javascript_include_tag "lib/bootstrap-fileupload" %>
+  <%= javascript_include_tag "lib/bootstrap-datetimepicker" %>
+  <%#= javascript_include_tag "lib/datetimepicker/date.time.picker.js" %>
+  <%= javascript_include_tag "lib/datetimepicker/datetimepicker.js" %>
+  <%#= javascript_include_tag "lib/ckeditor/ckeditor.js" %>
+  <%= javascript_include_tag "lib/modal-preview" %>
+<% end %>
 
-		<div id="widget-picture" class="widget-box">
-			<div class="widget-action clear tip" title="Upload pictures">
-				<a class="action"><i class="icon-exclamation-sign icon-white"></i></a>
-			</div>
-			<h3 class="widget-title"><i class="icons-pictures"></i><%= t('announcement.picture') %></h3>
-			<div class="widget-content clear">
-				<div class="control-group">
-           <!-- <img class="pull-left upload-picture" src="/assets/default-img.png" /> -->
-					<div  class="upload-picture">
-              <% if @bulletin.image %>
-              	<%= image_tag @bulletin.image rescue ''%>
-              <% else %>
-              	<img class="pull-left upload-picture" src="/assets/default-img.png" />
-              <% end %>
+<%= f.error_messages %>
+
+<!-- Input Area -->
+<div class="input-area">
+
+  <!-- Module Tabs -->
+  <div class="nav-name"><strong><%= t(:module) %></strong></div>
+  <ul class="nav nav-pills module-nav">
+    <li class="active">
+      <a href="#basic" data-toggle="tab"><%= t(:basic) %></a>
+    </li>
+    <% if show_form_status_field(@bulletin) %>
+      <li>
+        <a href="#status" data-toggle="tab"><%= t(:status) %></a>
+      </li>
+    <% end %>
+    <li>
+      <a href="#tag" data-toggle="tab"><%= t(:tags) %></a>
+    </li>
+    <li>
+      <a href="#imageupload" data-toggle="tab"><%= t(:image) %></a>
+    </li>
+  </ul>
+
+  <!-- Module -->
+  <div class="tab-content module-area">
+
+    <!-- Basic Module -->
+    <div class="tab-pane fade in active" id="basic">
+
+      <!-- Category -->
+      <div class="control-group">
+        <label class="control-label muted"><%= t(:category) %></label>
+        <div class="controls">
+          <%= f.select :bulletin_category_id, @bulletin_categorys.collect{|t| [ t.title, t.id ]} %>
+        </div>
+      </div>
+
+      <!-- Date Time Picker -->
+      <div class="control-group">
+        <%= f.datetime_picker :postdate, :picker_type => 'separated', :label => t(:start) %>
+      </div>
+
+      <div class="control-group">
+        <%= f.datetime_picker :deadline, :picker_type => 'separated', :label => t(:end) %>
+      </div>
+
+    </div>
+
+    <!-- Status Module -->
+    <% if show_form_status_field(@bulletin) %>
+      <div class="tab-pane fade" id="status">
+
+        <!-- Status -->
+        <div class="control-group">
+          <label class="control-label muted"><%= t(:status) %></label>
+          <div class="controls" data-toggle="buttons-checkbox">
+            <label class="checkbox inline btn <%= 'active' if @bulletin.is_top? %>">
+              <%= f.check_box :is_top %> <%= t(:top) %>
+            </label>
+            <label class="checkbox inline btn <%= 'active' if @bulletin.is_hot? %>">
+              <%= f.check_box :is_hot %> <%= t(:hot) %>
+            </label>
+            <label class="checkbox inline btn <%= 'active' if @bulletin.is_hidden? %>">
+              <%= f.check_box :is_hidden %> <%= t(:hide) %>
+            </label>
           </div>
-					<span class="alert widgetInfo"><%= t("ad.widget_info_for_ad_image_size", :best_size=> "290px x 150px") %></span>
-					<div class="controls file-upload input-prepend">
-						<%= t(:browse) %>
-						<%= f.file_field :image, :id => "input-upload", :class => '', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %>
-					<!-- <span id='fu' class="file-name"></span>
-					<br>
-					<input name='fu' class="input-medium" type="text">
-					<br> -->
-					<% if @bulletin.image.file %>
-					  <%= f.check_box :remove_image %>
-					  <%= t('delete.file') %>
-					<% end %>
-					</div>
-				</div>
-			</div>
-		</div>
+        </div>
 
-		<div id="widget-date" class="widget-box widget-size-300">
-			<div class="widget-action clear tip" title="Set the announcement to start and end dates">
-				<a href="#" class="action"><i class="icon-exclamation-sign icon-white"></i></a>
-			</div>
-			<h3 class="widget-title"><i class="icons-calendar"></i><%= t(:date_) %></h3>
-				<div class="widget-content clear">
-				<div class="control-group">
-					<%= f.datetime_picker :postdate, :picker_type => 'separated', :label => t(:start) %>
-				</div>
-				<div class="control-group">
-					<%= f.datetime_picker :deadline, :picker_type => 'separated', :label => t(:end) %>
-				</div>
-			</div>
-		</div>
+      </div>
+    <% end %>
 
-	<% if show_form_status_field(@bulletin)%>
-		<div id="widget-status" class="widget-box widget-size-300">
-			<div class="widget-action clear tip" title="Setting the announcement state">
-				<a class="action"><i class="icon-exclamation-sign icon-white"></i></a>
-			</div>
-			<h3 class="widget-title"><i class="icons-star"></i><%= t(:status) %></h3>
-			<div class="widget-content clear">
-				<div class="controls">
-				<%= content_tag :label,:class => "checkbox inline" do -%>
-					<%= f.check_box :is_top %>
-					<%= t('top') %>
-				<% end -%>
-				<%= content_tag :label,:class => "checkbox inline" do -%>
-					<%= f.check_box :is_hot %>
-					<%= t('hot') %>
-				<% end -%>
-				<%= content_tag :label,:class => "checkbox inline" do -%>
-					<%= f.check_box :is_hidden %>
-					<%= t('hide') %>
-				<% end -%>
-				</div>
-			</div>
-		</div>
-	<% end %>
-	<% if @bulletin.is_rejected %>
-		<div id="widget-rejected" class="widget-box widget-size-300">
-			<div class="widget-action clear tip" title="Rejected Report">
-				<a class="action"><i class="icon-cog icon-white"></i></a>
-			</div>
-			<h3 class="widget-title"><i class="icons-tag"></i><%= t('approval.stat') %></h3>
-				<div class="widget-content clear form-horizontal">
-					<%= @bulletin.not_checked_reason rescue t("rejected_reason_empty") %>
-				</div>
-		</div>
-	<% end %>
-		<div id="widget-tags" class="widget-box widget-size-300">
-			<div class="widget-action clear tip" title="Setting">
-				<a class="action"><i class="icon-cog icon-white"></i></a>
-			</div>
-			<h3 class="widget-title"><i class="icons-tag"></i><%= t(:tags) %></h3>
-				<div class="widget-content clear form-horizontal">
-					<p>
-						<% @tags.each do |tag| %>
-							<%= content_tag :label,:class => "checkbox inline" do -%>
-								<%= check_box_tag 'bulletin[tag_ids][]', tag.id, @bulletin.tag_ids.include?(tag.id) %>
-								<%= tag.name %>
-                <%= hidden_field_tag 'bulletin[tag_ids][]', '' %>
-							<% end %>
-						<% end %>
-					</p>
-				</div>
-		</div> 
-  	<% if params[:action] != 'new' %>
-		<div id="widget-audit" class="widget-box">
-			<div class="widget-action clear tip" title="A">
-				<a class="action"><i class="icon-exclamation-sign icon-white"></i></a>
-			</div>
-			
-		</div>
-		<% elsif current_user.admin? %>
-			<%= f.hidden_field :is_checked,:value => true%>
-		<% end %>
-	</div>
-  
+    <!-- Tag Module -->
+    <div class="tab-pane fade" id="tag">
 
-<!--Wiget End-->
-<!--Post Start-->
+      <!-- Tag -->
+      <div class="control-group">
+        <label class="control-label muted"><%= t(:tags) %></label>
+        <div class="controls" data-toggle="buttons-checkbox">
+          <% @tags.each do |tag| %>
+            <label class="checkbox inline btn <%= 'active' if @bulletin.tag_ids.include?(tag.id) %>">
+              <%= check_box_tag 'bulletin[tag_ids][]', tag.id, @bulletin.tag_ids.include?(tag.id) %> <%= tag.name %>
+              <%= hidden_field_tag 'bulletin[tag_ids][]', '' %>
+            </label>
+          <% end %>
+        </div>
+      </div>
 
-	<div id="post-body">
-		<div id="post-body-content" class="clear">
+    </div>
 
-			<%#= f.label :unit_list_for_anc%>
-			<%#= f.select :unit_list_for_anc_id,@unit_list_for_anc.collect{|t| [ t.title, t.id ]}, {}, :class => "input-medium" %>
-		
-			<%= f.label :category,t(:category)%> 
-			<%= f.select :bulletin_category_id, @bulletin_categorys.collect{|t| [ t.title, t.id ]}, {}, :class => "input-medium" %>
-			
-			<ul class="nav nav-tabs">
-				<%# @site_valid_locales.each_with_index do |locale, i| %>
-				<% @site_valid_locales.each_with_index do |locale, i| %>
-			    <li <%= ( i == 0 ) ? " class=active" : '' %>><a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
-				<% end %>
-			</ul>
-			
-			<div class="tab-content">
-			
-				<%# @site_valid_locales.each_with_index do |locale, i| %>
-				<% @site_valid_locales.each_with_index do |locale, i| %>
-				
-				<div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
+    <!-- Images Module -->
+    <div class="tab-pane fade" id="imageupload">
 
-					<div class="title">
-						<%= f.label :title ,t(:title)%>
-						<%= f.fields_for :title_translations do |f| %>
-							<%= I18nVariable.from_locale(locale) %>
-							<%= f.text_field locale, :class=>'post-title', :value => (@bulletin.title_translations[locale] rescue nil) %>
-						<% end %>
-					</div>			
+      <!-- Images Upload -->
+      <div class="control-group">
+        <label class="control-label muted"><%= t(:image) %></label>
+        <div class="controls">
+          <!-- if this page editing please add class "fileupload-edit" -->
+          <div class="fileupload fileupload-new clearfix" data-provides="fileupload">
+            <div class="fileupload-new thumbnail pull-left">
+              <% if @bulletin.image.file %>
+                <%= image_tag @bulletin.image %>
+              <% else %>
+                <img src="http://www.placehold.it/50x50/EFEFEF/AAAAAA" />
+              <% end %>
+            </div>
+            <div class="fileupload-preview fileupload-exists thumbnail pull-left"></div>
+            <span class="btn btn-file">
+              <span class="fileupload-new"><%= t(:select_image) %></span>
+              <span class="fileupload-exists"><%= t(:change) %></span>
+              <%= f.file_field :image %>
+            </span>
+            <a href="#" class="btn fileupload-exists" data-dismiss="fileupload"><%= t(:cancel) %></a>
+            <label class="checkbox fileupload-remove">
+              <input type="checkbox"> <%= t(:remove) %>
+            </label>
+            <% if @bulletin.image.file %>
+              <%= f.check_box :remove_image %>
+              <%= t('delete') %>
+            <% end %>
+          </div>
+        </div>
+      </div>
 
-					<div class="editor">
-						<%= f.label :subtitle, t(:subtitle) %>
-						<%= f.fields_for :subtitle_translations do |f| %>
-							<%= I18nVariable.from_locale(locale) %>
-							<%= f.text_area locale, :rows => 5, :style=>"width:100%", :value => (@bulletin.subtitle_translations[locale] rescue nil) %>
-						<% end %>
-					</div>  
-					
-					<div class="editor">
-						<%= f.label :text ,t(:text)%>
-						<%= f.fields_for :text_translations do |f| %>
-							<%= I18nVariable.from_locale(locale) %>
-							<%= f.text_area locale, :style=>"width:100%", :class => 'tinymce_textarea', :value => (@bulletin.text_translations[locale] rescue nil) %>
-						<% end %>				
-					</div>
-				
-				</div>
-				
-				<% end %>
-				
-			</div>
-			
-			<div class="main-wiget">
-				<div id="widget-link" class="widget-box">
-					<div class="widget-action clear tip" title="Add a reference link">
-						<a class="action"><i class="icon-exclamation-sign icon-white"></i></a>
-					</div>
-					<h3 class="widget-title"><i class="icons-link"></i><%= t(:link) %></h3>
-					<div class="widget-content">
-					
-					<div id='bulletin_links' class="bulletin_links_block">
-					
-					<table class="table table-condensed">
-						<thead>
-							<tr>
-								<th><%= t('announcement.url') %></th>
-								<th><%= t('announcement.link_name') %></th>
-								<th class="span1"></th>
-							</tr>
-						</thead>
-						<tfoot>
-							<tr>
-								<td style="text-align:center" colspan="4">
-									<div id='add_bulletin_link' class="info_input bulletin_links_block">
-										<%= hidden_field_tag 'bulletin_link_field_count', @bulletin.bulletin_links.count %>
-										<a class="add"><span class="btn btn-primary btn-small"><i class="icon-plus icon-white"></i><%= t(:add) %></span></a>
-									</div>
-								</td>
-							</tr>
-						</tfoot>
-						<tbody>
-						
-							<% @bulletin.bulletin_links.each_with_index do |bulletin_link, i| %>
-								<%#= fields_for "bulletin[bulletin_links][]", bulletin_link do |f| %>
-								<%= f.fields_for :bulletin_links, bulletin_link do |f| %>
-									<%= render :partial => 'form_bulletin_link', :object => bulletin_link, :locals => {:f => f, :i => i} %>
-								<% end %>
-							<% end %>	
-							
-						</tbody>
-					</table>
-					
-								
-					</div>
-							
-					</div>
-				</div>
-				<div id="widget-file" class="widget-box">
-					<div class="widget-action clear tip" title="Added to the file">
-						<a class="action"><i class="icon-exclamation-sign icon-white"></i></a>
-					</div>
-					<h3 class="widget-title"><i class="icons-paperclip"></i><%= t('announcement.file') %></h3>
-					<div class="widget-content">
-						
-					<div id='bulletin_files' class="bulletin_files_block">
-							
-					<table class="table table-condensed">
-						<thead>
-							<tr>
-								<th><%= t('announcement.selected_file') %></th>
-								<th><%= t('announcement.file_name') %></th>
-								<th><%= t('announcement.file_description') %></th>
-								<th class="span1"></th>
-							</tr>
-						</thead>
-						<tfoot>
-							<tr>
-								<td style="text-align:center" colspan="4">
-									<div id='add_bulletin_file' class="info_input bulletin_files_block">
-										<%= hidden_field_tag 'bulletin_file_field_count', @bulletin.bulletin_files.count %>
-										<a class="add"><span class="btn btn-primary btn-small"><i class="icon-plus icon-white"></i><%= t(:add) %></span></a>
-										<p><%= t("sys.limit_of_upload_file_size",:best_size => '3MB') %></p>
-										<p><%= t("sys.preview_only_for_img") %></p>
-									</div>
-								</td>
-							</tr>
-						</tfoot>
-						<tbody>
-								<% @bulletin.bulletin_files.each_with_index do |bulletin_file, i| %>
-									<%#= fields_for "bulletin[bulletin_files][]", bulletin_file do |f| %>
-									<%= f.fields_for :bulletin_files, bulletin_file do |f| %>
-										<%= render :partial => 'form_bulletin_file', :object => bulletin_file, :locals => {:f => f, :i => i} %>
-									<% end %>
-								<% end %>	
-							
-						</tbody>
-					</table>
-								
-					</div>
-					
-					</div>
-				</div>
-			</div>		
-	
-		</div>
-	<!--Post End-->
-	</div>
+    </div>
 
-	  <div class="form-actions">
-	  	<%= button_tag t("preview"), :id=>"button_for_preview", :name=>"commit",:class=>'btn post_preview two_btn',:type=>:button,:url=>preview_panel_announcement_back_end_bulletins_path %>
-		<%= f.submit t('submit'), :class=>'btn btn-primary two_btn' %>
-		<%= link_to t('cancel'), get_go_back, :class=>"btn" %> 
-	  </div>
-  
   </div>
-  
-  
+
+  <!-- Language Tabs -->
+  <div class="nav-name"><strong><%= t(:language) %></strong></div>
+  <ul class="nav nav-pills language-nav">
+    <% @site_valid_locales.each_with_index do |locale, i| %>
+      <li class="<%= 'active' if i == 0 %>">
+        <a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a>
+      </li>
+    <% end %>
+  </ul>
+
+  <!-- Language -->
+  <div class="tab-content language-area">
+
+    <% @site_valid_locales.each_with_index do |locale, i| %>
+    
+      <div class="<%= locale %> tab-pane fade <%= ( i == 0 ) ? "in active" : '' %>">
+
+        <!-- Title-->
+        <div class="control-group input-title">
+          <label class="control-label muted"><%= t(:title) %></label>
+          <div class="controls">
+            <%= f.fields_for :title_translations do |f| %>
+              <%= f.text_field locale, class: "input-block-level", placeholder: t(:title), value: (@bulletin.title_translations[locale] rescue nil) %>
+            <% end %>
+          </div>
+        </div>
+
+        <!-- Sub Title -->
+        <div class="control-group input-subtitle">
+          <label class="control-label muted"><%= t(:subtitle) %></label>
+          <div class="controls">
+            <div class="textarea">
+              <%= f.fields_for :subtitle_translations do |f| %>
+                <%= f.text_area locale, rows: 2, class: "input-block-level", value: (@bulletin.subtitle_translations[locale] rescue nil) %>
+              <% end %>
+            </div>
+          </div>
+        </div>
+
+        <!-- Content -->
+        <div class="control-group input-content">
+          <label class="control-label muted"><%= t(:content) %></label>
+          <div class="controls">
+            <div class="textarea">
+              <%= f.fields_for :text_translations do |f| %>
+                <%= f.text_area locale, rows: 5, class: "ckeditor input-block-level", id: "content_#{locale}", name: "content_#{locale}", :value => (@bulletin.text_translations[locale] rescue nil) %>
+              <% end %>
+            </div>
+          </div>
+        </div>
+
+      </div>
+
+    <% end %>
+
+    <!-- Link -->
+    <div class="control-group">
+      <label class="control-label muted"><%= t(:link) %></label>
+      <div class="controls add-input">
+
+        <!-- Exist -->
+        <% if @bulletin && !@bulletin.bulletin_links.blank? %>
+          <div class="exist">
+            <% @bulletin.bulletin_links.each_with_index do |bulletin_link, i| %>
+              <%= f.fields_for :bulletin_links, bulletin_link do |f| %>
+                <%= render :partial => 'form_link', :object => bulletin_link, :locals => {:f => f, :i => i} %>
+              <% end %>
+            <% end %> 
+            <hr>
+          </div>
+        <% end %>
+
+        <!-- Add -->
+        <div class="add-target">
+        </div>
+        <p class="add-btn">
+          <%= hidden_field_tag 'bulletin_link_field_count', @bulletin.bulletin_links.count %>
+          <a id="add_link" class="trigger btn btn-small btn-primary"><i class="icons-plus"></i> <%= t(:add) %></a>
+        </p>
+
+      </div>
+    </div>
+
+    <!-- File -->
+    <div class="control-group">
+      <label class="control-label muted"><%= t(:file_) %></label>
+      <div class="controls">
+
+        <!-- Exist -->
+        <% if @bulletin && !@bulletin.bulletin_files.blank? %>
+          <div class="exist">
+            <% @bulletin.bulletin_files.each_with_index do |bulletin_file, i| %>
+              <%= f.fields_for :bulletin_files, bulletin_file do |f| %>
+                <%= render :partial => 'form_file', :object => bulletin_file, :locals => {:f => f, :i => i} %>
+              <% end %>
+            <% end %> 
+            <hr>
+          </div>
+        <% end %>
+
+        <!-- Add -->
+        <div class="add-target">
+        </div>
+        <p class="add-btn">
+          <%= hidden_field_tag 'bulletin_file_field_count', @bulletin.bulletin_files.count %>
+          <a id="add_file" class="trigger btn btn-small btn-primary"><i class="icons-plus"></i> <%= t(:add) %></a>
+        </p>
+
+      </div>
+    </div>
+  </div>
+
+</div>
+
+<!-- Form Actions -->
+<div class="form-actions">
+  <%= f.submit t('submit'), class: 'btn btn-primary' %>
+  <%= button_tag t("preview"), id: "button_for_preview", name: "commit", class: 'btn post_preview', type: :button, url: preview_panel_announcement_back_end_bulletins_path %>
+  <%= link_to t('cancel'), get_go_back, :class=>"btn" %>  
+</div>
 
 <% content_for :page_specific_javascript do %>
-	<%= javascript_include_tag "bulletin_form" %>
-	<%= javascript_include_tag "inc/jquery.imagesloaded.js" %>
-	<script>
-	$(document).ready(function() {
-
-		$('#add_bulletin_link a.add').live('click', function(){
-			var new_id = $(this).prev().attr('value');
-			var old_id = new RegExp("new_bulletin_links", "g");
-			$(this).prev().attr('value', parseInt(new_id) + 1);
-			$(this).parents('table').append(("<%= escape_javascript(add_attribute 'form_bulletin_link', f, :bulletin_links) %>").replace(old_id, new_id));
-		});
-		$('#add_bulletin_file a.add').live('click', function(){
-			var new_id = $(this).prev().attr('value');
-			var old_id = new RegExp("new_bulletin_files", "g");
-			$(this).prev().attr('value', parseInt(new_id) + 1);
-			$(this).parents('table').append(("<%= escape_javascript(add_attribute 'form_bulletin_file', f, :bulletin_files) %>").replace(old_id, new_id));
-		});
-		$('.for_preview').popover({ html : true });
-	});
-	</script>
-<% end %>
+  <script>
+    $(document).ready(function() {
+      $(document).on('click', '#add_link', function(){
+        var new_id = $(this).prev().attr('value');
+        var old_id = new RegExp("new_bulletin_links", "g");
+        $(this).prev().attr('value', parseInt(new_id) + 1);
+        $(this).parent().siblings('.add-target').append(("<%= escape_javascript(add_attribute 'form_link', f, :bulletin_links) %>").replace(old_id, new_id));
+      });
+      $(document).on('click', '#add_file', function(){
+        var new_id = $(this).prev().attr('value');
+        var old_id = new RegExp("new_bulletin_files", "g");
+        $(this).prev().attr('value', parseInt(new_id) + 1);
+        $(this).parent().siblings('.add-target').append(("<%= escape_javascript(add_attribute 'form_file', f, :bulletin_files) %>").replace(old_id, new_id));
+      });
+      $('.for_preview').popover({ html : true });
+      $(document).on('click', '.delete_link', function(){
+        $(this).parents('.input-prepend').remove();
+      });
+      $(document).on('click', '.remove_existing_record', function(){
+        if(confirm("<%= I18n.t(:sure?)%>")){
+          $(this).next('.should_destroy').attr('value', 1);
+          $(this).parents('.start-line').hide();
+        }
+      });
+    });
+  </script>
+<% end %>
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_back.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_back.html.erb
new file mode 100644
index 000000000..289608773
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_back.html.erb
@@ -0,0 +1,305 @@
+<% # encoding: utf-8 %>
+<% content_for :page_specific_javascript do -%>
+	<%= javascript_include_tag "inc/modal-preview" %>
+<% end -%>
+	<!--Widget start-->
+	<%= f.error_messages %>
+	
+	<div id="sub-wiget">
+
+		<div id="widget-picture" class="widget-box">
+			<div class="widget-action clear tip" title="Upload pictures">
+				<a class="action"><i class="icon-exclamation-sign icon-white"></i></a>
+			</div>
+			<h3 class="widget-title"><i class="icons-pictures"></i><%= t('announcement.picture') %></h3>
+			<div class="widget-content clear">
+				<div class="control-group">
+           <!-- <img class="pull-left upload-picture" src="/assets/default-img.png" /> -->
+					<div  class="upload-picture">
+              <% if @bulletin.image %>
+              	<%= image_tag @bulletin.image rescue ''%>
+              <% else %>
+              	<img class="pull-left upload-picture" src="/assets/default-img.png" />
+              <% end %>
+          </div>
+					<span class="alert widgetInfo"><%= t("ad.widget_info_for_ad_image_size", :best_size=> "290px x 150px") %></span>
+					<div class="controls file-upload input-prepend">
+						<%= t(:browse) %>
+						<%= f.file_field :image, :id => "input-upload", :class => '', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %>
+					<!-- <span id='fu' class="file-name"></span>
+					<br>
+					<input name='fu' class="input-medium" type="text">
+					<br> -->
+					<% if @bulletin.image.file %>
+					  <%= f.check_box :remove_image %>
+					  <%= t('delete.file') %>
+					<% end %>
+					</div>
+				</div>
+			</div>
+		</div>
+
+		<div id="widget-date" class="widget-box widget-size-300">
+			<div class="widget-action clear tip" title="Set the announcement to start and end dates">
+				<a href="#" class="action"><i class="icon-exclamation-sign icon-white"></i></a>
+			</div>
+			<h3 class="widget-title"><i class="icons-calendar"></i><%= t(:date_) %></h3>
+				<div class="widget-content clear">
+				<div class="control-group">
+					<%= f.datetime_picker :postdate, :picker_type => 'separated', :label => t(:start) %>
+				</div>
+				<div class="control-group">
+					<%= f.datetime_picker :deadline, :picker_type => 'separated', :label => t(:end) %>
+				</div>
+			</div>
+		</div>
+
+	<% if show_form_status_field(@bulletin)%>
+		<div id="widget-status" class="widget-box widget-size-300">
+			<div class="widget-action clear tip" title="Setting the announcement state">
+				<a class="action"><i class="icon-exclamation-sign icon-white"></i></a>
+			</div>
+			<h3 class="widget-title"><i class="icons-star"></i><%= t(:status) %></h3>
+			<div class="widget-content clear">
+				<div class="controls">
+				<%= content_tag :label,:class => "checkbox inline" do -%>
+					<%= f.check_box :is_top %>
+					<%= t('top') %>
+				<% end -%>
+				<%= content_tag :label,:class => "checkbox inline" do -%>
+					<%= f.check_box :is_hot %>
+					<%= t('hot') %>
+				<% end -%>
+				<%= content_tag :label,:class => "checkbox inline" do -%>
+					<%= f.check_box :is_hidden %>
+					<%= t('hide') %>
+				<% end -%>
+				</div>
+			</div>
+		</div>
+	<% end %>
+	<% if @bulletin.is_rejected %>
+		<div id="widget-rejected" class="widget-box widget-size-300">
+			<div class="widget-action clear tip" title="Rejected Report">
+				<a class="action"><i class="icon-cog icon-white"></i></a>
+			</div>
+			<h3 class="widget-title"><i class="icons-tag"></i><%= t('approval.stat') %></h3>
+				<div class="widget-content clear form-horizontal">
+					<%= @bulletin.not_checked_reason rescue t("rejected_reason_empty") %>
+				</div>
+		</div>
+	<% end %>
+		<div id="widget-tags" class="widget-box widget-size-300">
+			<div class="widget-action clear tip" title="Setting">
+				<a class="action"><i class="icon-cog icon-white"></i></a>
+			</div>
+			<h3 class="widget-title"><i class="icons-tag"></i><%= t(:tags) %></h3>
+				<div class="widget-content clear form-horizontal">
+					<p>
+						<% @tags.each do |tag| %>
+							<%= content_tag :label,:class => "checkbox inline" do -%>
+								<%= check_box_tag 'bulletin[tag_ids][]', tag.id, @bulletin.tag_ids.include?(tag.id) %>
+								<%= tag.name %>
+                <%= hidden_field_tag 'bulletin[tag_ids][]', '' %>
+							<% end %>
+						<% end %>
+					</p>
+				</div>
+		</div> 
+  	<% if params[:action] != 'new' %>
+		<div id="widget-audit" class="widget-box">
+			<div class="widget-action clear tip" title="A">
+				<a class="action"><i class="icon-exclamation-sign icon-white"></i></a>
+			</div>
+			
+		</div>
+		<% elsif current_user.admin? %>
+			<%= f.hidden_field :is_checked,:value => true%>
+		<% end %>
+	</div>
+  
+
+<!--Wiget End-->
+<!--Post Start-->
+
+	<div id="post-body">
+		<div id="post-body-content" class="clear">
+
+			<%#= f.label :unit_list_for_anc%>
+			<%#= f.select :unit_list_for_anc_id,@unit_list_for_anc.collect{|t| [ t.title, t.id ]}, {}, :class => "input-medium" %>
+		
+			<%= f.label :category,t(:category)%> 
+			<%= f.select :bulletin_category_id, @bulletin_categorys.collect{|t| [ t.title, t.id ]}, {}, :class => "input-medium" %>
+			
+			<ul class="nav nav-tabs">
+				<%# @site_valid_locales.each_with_index do |locale, i| %>
+				<% @site_valid_locales.each_with_index do |locale, i| %>
+			    <li <%= ( i == 0 ) ? " class=active" : '' %>><a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
+				<% end %>
+			</ul>
+			
+			<div class="tab-content">
+			
+				<%# @site_valid_locales.each_with_index do |locale, i| %>
+				<% @site_valid_locales.each_with_index do |locale, i| %>
+				
+				<div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
+
+					<div class="title">
+						<%= f.label :title ,t(:title)%>
+						<%= f.fields_for :title_translations do |f| %>
+							<%= I18nVariable.from_locale(locale) %>
+							<%= f.text_field locale, :class=>'post-title', :value => (@bulletin.title_translations[locale] rescue nil) %>
+						<% end %>
+					</div>			
+
+					<div class="editor">
+						<%= f.label :subtitle, t(:subtitle) %>
+						<%= f.fields_for :subtitle_translations do |f| %>
+							<%= I18nVariable.from_locale(locale) %>
+							<%= f.text_area locale, :rows => 5, :style=>"width:100%", :value => (@bulletin.subtitle_translations[locale] rescue nil) %>
+						<% end %>
+					</div>  
+					
+					<div class="editor">
+						<%= f.label :text ,t(:text)%>
+						<%= f.fields_for :text_translations do |f| %>
+							<%= I18nVariable.from_locale(locale) %>
+							<%= f.text_area locale, :style=>"width:100%", :class => 'tinymce_textarea', :value => (@bulletin.text_translations[locale] rescue nil) %>
+						<% end %>				
+					</div>
+				
+				</div>
+				
+				<% end %>
+				
+			</div>
+			
+			<div class="main-wiget">
+				<div id="widget-link" class="widget-box">
+					<div class="widget-action clear tip" title="Add a reference link">
+						<a class="action"><i class="icon-exclamation-sign icon-white"></i></a>
+					</div>
+					<h3 class="widget-title"><i class="icons-link"></i><%= t(:link) %></h3>
+					<div class="widget-content">
+					
+					<div id='bulletin_links' class="bulletin_links_block">
+					
+					<table class="table table-condensed">
+						<thead>
+							<tr>
+								<th><%= t('announcement.url') %></th>
+								<th><%= t('announcement.link_name') %></th>
+								<th class="span1"></th>
+							</tr>
+						</thead>
+						<tfoot>
+							<tr>
+								<td style="text-align:center" colspan="4">
+									<div id='add_bulletin_link' class="info_input bulletin_links_block">
+										<%= hidden_field_tag 'bulletin_link_field_count', @bulletin.bulletin_links.count %>
+										<a class="add"><span class="btn btn-primary btn-small"><i class="icon-plus icon-white"></i><%= t(:add) %></span></a>
+									</div>
+								</td>
+							</tr>
+						</tfoot>
+						<tbody>
+						
+							<% @bulletin.bulletin_links.each_with_index do |bulletin_link, i| %>
+								<%#= fields_for "bulletin[bulletin_links][]", bulletin_link do |f| %>
+								<%= f.fields_for :bulletin_links, bulletin_link do |f| %>
+									<%= render :partial => 'form_bulletin_link', :object => bulletin_link, :locals => {:f => f, :i => i} %>
+								<% end %>
+							<% end %>	
+							
+						</tbody>
+					</table>
+					
+								
+					</div>
+							
+					</div>
+				</div>
+				<div id="widget-file" class="widget-box">
+					<div class="widget-action clear tip" title="Added to the file">
+						<a class="action"><i class="icon-exclamation-sign icon-white"></i></a>
+					</div>
+					<h3 class="widget-title"><i class="icons-paperclip"></i><%= t('announcement.file') %></h3>
+					<div class="widget-content">
+						
+					<div id='bulletin_files' class="bulletin_files_block">
+							
+					<table class="table table-condensed">
+						<thead>
+							<tr>
+								<th><%= t('announcement.selected_file') %></th>
+								<th><%= t('announcement.file_name') %></th>
+								<th><%= t('announcement.file_description') %></th>
+								<th class="span1"></th>
+							</tr>
+						</thead>
+						<tfoot>
+							<tr>
+								<td style="text-align:center" colspan="4">
+									<div id='add_bulletin_file' class="info_input bulletin_files_block">
+										<%= hidden_field_tag 'bulletin_file_field_count', @bulletin.bulletin_files.count %>
+										<a class="add"><span class="btn btn-primary btn-small"><i class="icon-plus icon-white"></i><%= t(:add) %></span></a>
+										<p><%= t("sys.limit_of_upload_file_size",:best_size => '3MB') %></p>
+										<p><%= t("sys.preview_only_for_img") %></p>
+									</div>
+								</td>
+							</tr>
+						</tfoot>
+						<tbody>
+								<% @bulletin.bulletin_files.each_with_index do |bulletin_file, i| %>
+									<%#= fields_for "bulletin[bulletin_files][]", bulletin_file do |f| %>
+									<%= f.fields_for :bulletin_files, bulletin_file do |f| %>
+										<%= render :partial => 'form_bulletin_file', :object => bulletin_file, :locals => {:f => f, :i => i} %>
+									<% end %>
+								<% end %>	
+							
+						</tbody>
+					</table>
+								
+					</div>
+					
+					</div>
+				</div>
+			</div>		
+	
+		</div>
+	<!--Post End-->
+	</div>
+
+	  <div class="form-actions">
+	  	<%= button_tag t("preview"), :id=>"button_for_preview", :name=>"commit",:class=>'btn post_preview two_btn',:type=>:button,:url=>preview_panel_announcement_back_end_bulletins_path %>
+		<%= f.submit t('submit'), :class=>'btn btn-primary two_btn' %>
+		<%= link_to t('cancel'), get_go_back, :class=>"btn" %> 
+	  </div>
+  
+  </div>
+  
+  
+
+<% content_for :page_specific_javascript do %>
+	<%= javascript_include_tag "bulletin_form" %>
+	<%= javascript_include_tag "inc/jquery.imagesloaded.js" %>
+	<script>
+	$(document).ready(function() {
+
+		$('#add_bulletin_link a.add').live('click', function(){
+			var new_id = $(this).prev().attr('value');
+			var old_id = new RegExp("new_bulletin_links", "g");
+			$(this).prev().attr('value', parseInt(new_id) + 1);
+			$(this).parents('table').append(("<%= escape_javascript(add_attribute 'form_bulletin_link', f, :bulletin_links) %>").replace(old_id, new_id));
+		});
+		$('#add_bulletin_file a.add').live('click', function(){
+			var new_id = $(this).prev().attr('value');
+			var old_id = new RegExp("new_bulletin_files", "g");
+			$(this).prev().attr('value', parseInt(new_id) + 1);
+			$(this).parents('table').append(("<%= escape_javascript(add_attribute 'form_bulletin_file', f, :bulletin_files) %>").replace(old_id, new_id));
+		});
+		$('.for_preview').popover({ html : true });
+	});
+	</script>
+<% end %>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb
deleted file mode 100644
index 1cd0d6f38..000000000
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb
+++ /dev/null
@@ -1,76 +0,0 @@
-<% # encoding: utf-8 %>
-
-<tr id="<%= "bulletin_file_#{form_bulletin_file.id}" if !form_bulletin_file.new_record? %>" class='list_item'>
-  <td>
-    <div class="control-group">
-      <div class="controls">
-        <% if form_bulletin_file.new_record? %>
-          <%= f.file_field :file %>
-        <% end %>
-        <%= form_bulletin_file.file.file ? ( link_to t(:view), form_bulletin_file.file.url, {:class => 'for_preview btn', :target => '_blank', :title => t(:view), "data-trigger" => :hover}.merge(file_picture_preview_setting(form_bulletin_file.file.url)) ) : '' %>
-      </div>
-    </div>
-  </td> 
-  <td> 
-
-    <div class="tab-content">
-
-      <% @site_valid_locales.each_with_index do |locale, i| %>
-
-        <div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
-
-          <%= f.fields_for :title_translations do |f| %>
-            <div class="control-group">
-              <label for="link-<%= locale %>" class="control-label"><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></label>
-              <div class="controls">
-                <%= f.text_field locale, :id => "link-#{locale}", :value => (form_bulletin_file.title_translations[locale] rescue nil) %>
-              </div>
-            </div>
-          <% end %>
-
-        </div>
-
-      <% end %>
-
-    </div>
-
-  </td>
-  <td> 
-
-    <div class="tab-content">
-
-      <% @site_valid_locales.each_with_index do |locale, i| %>
-
-        <div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
-
-          <%= f.fields_for :description_translations do |f| %>
-            <div class="control-group">
-              <label for="link-<%= locale %>" class="control-label"><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></label>
-              <div class="controls">
-                <%= f.text_field locale, :id => "link-#{locale}", :value => (form_bulletin_file.description_translations[locale] rescue nil) %>
-              </div>
-            </div>
-          <% end %>
-
-        </div>
-
-      <% end %>
-
-    </div>
-
-  </td> 
-  <td>
-    <span class="action">
-      <% if form_bulletin_file.new_record? %>
-        <a class="delete"><i class="icon-remove"></i></a>
-      <% else %> 
-        <%= f.hidden_field :id %>
-        <%= hidden_field_tag :tr, (dom_id form_bulletin_file) %>
-        <a class="remove_existing_record"><i class="icon-remove"></i></a>
-        <%= f.hidden_field :_destroy, :value => nil, :class => 'should_destroy' %>
-      <% end %>
-    </span>
-
-  </td>
-</tr>
-
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb
deleted file mode 100644
index c0b7f710a..000000000
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-
-		<tr id="<%= "bulletin_link_#{form_bulletin_link.id}" if !form_bulletin_link.new_record? %>" class='list_item'>
-			
-			<td>
-				<div class="control-group">
-					<div class="controls">
-					<%= f.text_field :url %>
-					</div>
-				</div>
-			</td>	
-			<td>
-	
-			
-				<div class="tab-content">
-				
-					<% @site_valid_locales.each_with_index do |locale, i| %>
-					
-					<div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
-						
-						<%= f.fields_for :title_translations do |f| %>
-							<div class="control-group">
-								<label for="link-<%= locale %>" class="control-label"><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></label>
-								<div class="controls">
-								<%= f.text_field locale, :id => "link-#{locale}", :class => "input-xlarge", :value => (form_bulletin_link.title_translations[locale] rescue nil) %>
-								</div>
-							</div>
-						<% end %>
-						
-					</div>
-
-					<% end %>
-					
-				</div>
-				
-			</td>
-			<td>
-			<span class="action">
-			<% if form_bulletin_link.new_record? %>
-			  <a class="delete"><i class="icon-remove"></i></a>
-			<% else %>	
-			  <%= f.hidden_field :id %>
-			  <%= hidden_field_tag :tr, (dom_id form_bulletin_link) %>
-			  <a class="remove_existing_record"><i class="icon-remove"></i></a>
-			  <%= f.hidden_field :_destroy, :value => nil, :class => 'should_destroy' %>
-			<% end %>
-			</span>
-			</td>
-		</tr>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_file.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_file.html.erb
new file mode 100644
index 000000000..5b1797428
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_file.html.erb
@@ -0,0 +1,51 @@
+<% if form_file.new_record? %>
+  <div class="fileupload fileupload-new start-line" data-provides="fileupload">
+<% else %>
+  <div class="fileupload-new start-line">
+  <%= link_to form_file.file_identifier, form_file.file.url, {:class => 'file-link for_preview', :target => '_blank', :title => t(:view), "data-trigger" => :hover}.merge(file_picture_preview_setting(form_file.file.url)) %>
+<% end %>
+  <div class="input-prepend input-append">
+    <% if form_file.new_record? %>
+      <label>
+        <span class="add-on btn btn-file">
+          <i class="icons-paperclip"></i>
+          <%= f.file_field :file %>
+        </span>
+        <div class="uneditable-input input-medium">
+          <i class="icon-file fileupload-exists"></i>
+          <span class="fileupload-preview"><%= t(:select_file) %></span>
+        </div>
+      </label>
+    <% end %>
+    <span class="add-on icons-pencil"></span>
+    <span class="tab-content">
+      <% @site_valid_locales.each_with_index do |locale, i| %>
+        <span class="tab-pane fade <%= ( i == 0 ) ? "in active" : '' %> <%= locale %>">
+          <%= f.fields_for :title_translations do |f| %>
+            <%= f.text_field locale, :class => "input-medium", placeholder: t(:alternative), :value => (form_file.title_translations[locale] rescue nil) %>
+          <% end %>
+        </span>
+      <% end %>
+    </span>
+    <span class="add-on icons-pencil"></span>
+    <span class="tab-content">
+      <% @site_valid_locales.each_with_index do |locale, i| %>
+        <span class="tab-pane fade <%= ( i == 0 ) ? "in active" : '' %> <%= locale %>">
+          <%= f.fields_for :description_translations do |f| %>
+            <%= f.text_field locale, :class => "input-medium", placeholder: t(:description), :value => (form_file.description_translations[locale] rescue nil) %>
+          <% end %>
+        </span>
+      <% end %>
+    </span>
+    </span>
+    <span class="add-on btn">
+      <% if form_file.new_record? %>
+        <a class="delete_file icon-trash"></a>
+      <% else %> 
+        <%= f.hidden_field :id %>
+        <a class="remove_existing_record icon-remove"></a>
+        <%= f.hidden_field :_destroy, :value => nil, :class => 'should_destroy' %>
+      <% end %>
+    </span>
+  </div>
+</div>
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_link.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_link.html.erb
new file mode 100644
index 000000000..5f430238f
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_link.html.erb
@@ -0,0 +1,23 @@
+<div class="input-prepend input-append start-line">
+  <span class="add-on icons-link"></span>
+  <%= f.text_field :url, class: "input-large", placeholder: t(:url) %>
+  <span class="add-on icons-pencil"></span>
+  <span class="tab-content">
+    <% @site_valid_locales.each_with_index do |locale, i| %>
+      <span class="tab-pane fade <%= ( i == 0 ) ? "in active" : '' %> <%= locale %>">
+        <%= f.fields_for :title_translations do |f| %>
+          <%= f.text_field locale, :class => "input-large", placeholder: t(:url_alt), :value => (form_link.title_translations[locale] rescue nil) %>
+        <% end %>
+      </span>
+    <% end %>
+  </span>
+  <span class="add-on btn">
+    <% if form_link.new_record? %>
+      <a class="delete_link icon-trash"></a>
+    <% else %>  
+      <%= f.hidden_field :id %>
+      <a class="remove_existing_record icon-remove"></a>
+      <%= f.hidden_field :_destroy, :value => nil, :class => 'should_destroy' %>
+    <% end %>
+  </span>
+</div>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_list_bulletin_file.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_list_bulletin_file.html.erb
deleted file mode 100644
index 4fca4715b..000000000
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_list_bulletin_file.html.erb
+++ /dev/null
@@ -1,20 +0,0 @@
-<tr id="<%= dom_id list_bulletin_file %>">
-	<td><%= list_bulletin_file.file.file ? ( link_to list_bulletin_file.title_translations['zh_tw'], list_bulletin_file.file.url, {:target => '_blank', :title => list_bulletin_file.description_translations['zh_tw']} ) : list_bulletin_file.title_translations['zh_tw'] %></td>
-	<td><%= list_bulletin_file.file.file ? ( link_to list_bulletin_file.title_translations['en'], list_bulletin_file.file.url, {:target => '_blank', :title => list_bulletin_file.description_translations['en']} ) : list_bulletin_file.title_translations['zh_tw'] %></td>
-	<td>
-		<a href="<%= panel_announcement_back_end_bulletin_file_quick_edit_path(list_bulletin_file) %>#modal-file" data-toggle="modal" data-remote="true" class="action"><i class="icon-pencil"></i></a>
-		<span class="action">
-			<%= fields_for "bulletin[bulletin_files_attributes][]", list_bulletin_file, :index => list_bulletin_file_counter do |f| %>
-				<%= f.hidden_field :id %>
-				<%= hidden_field_tag :tr, (dom_id list_bulletin_file) %>
-				<a class="remove_existing_record"><i class="icon-remove"></i></a>
-				<%= f.hidden_field :_destroy, :value => nil , :class => 'should_destroy' %>
-			<% end %>
-		 </span>
-	</td>
-</tr>
-				
-				
-
-				
-				
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_list_bulletin_link.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_list_bulletin_link.html.erb
deleted file mode 100644
index 536425fc4..000000000
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_list_bulletin_link.html.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<tr id="<%= dom_id list_bulletin_link %>">
-	<td><%= link_to list_bulletin_link.title_translations['zh_tw'], list_bulletin_link.url, :target => '_blank' %></td>
-	<td><%= link_to list_bulletin_link.title_translations['en'], list_bulletin_link.url, :target => '_blank' %></td>
-	<td>
-		<a href="<%= panel_announcement_back_end_bulletin_link_quick_edit_path(list_bulletin_link) %>#modal-link" data-toggle="modal" data-remote="true" class="action"><i class="icon-pencil"></i></a>
-		<span class="action">
-			<%= fields_for "bulletin[bulletin_links_attributes][]", list_bulletin_link, :index => list_bulletin_link_counter do |f| %>
-				<%= f.hidden_field :id %>
-				<%= hidden_field_tag :tr, (dom_id list_bulletin_link) %>
-				<a class="remove_existing_record"><i class="icon-remove"></i></a>
-		  	<%= f.hidden_field :_destroy, :value => nil, :class => 'should_destroy' %>
-			<% end %>
-		</span>
-	</td>
-</tr>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit.html.erb
deleted file mode 100644
index 7c303b234..000000000
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit.html.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<td colspan="8">
-	<legend><%= t(:quick_edit) %> - <span class='qe_title'></span><%= t(type) %></legend>
-	<%= form_for @bulletin, :url => panel_announcement_back_end_bulletin_path(@bulletin), :html => {:class => 'form-horizontal'} do |f| %>
-		<%= render :partial => "panel/announcement/back_end/bulletins/quick_edit_#{@type}", :locals => { :f => f, :bulletin => @bulletin } %>
-		<div class="form-actions">
-			<%= f.submit t(:submit), :class => 'btn btn-primary' %>
-			<%= f.submit t(:cancel), :class => 'btn quick_edit_cancel', :type => 'reset', :rel => dom_id(@bulletin, :edit) %>
-		</div>
-	<% end %>
-</td>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_basic.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_basic.html.erb
deleted file mode 100644
index c5fd90347..000000000
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_basic.html.erb
+++ /dev/null
@@ -1,64 +0,0 @@
-<div id="qe-basic" class="qe-edit-div">
-	<div id="widget-category">
-		<div class="control-group">
-			<label class="control-label"><%= t(:category) %></label>
-			<div class="controls">
-				<%= f.select :bulletin_category_id, @bulletin_categories.collect {|t| [ t.title, t.id ]}, {}, :class => 'input-large' %>
-			</div>
-		</div>
-	</div>
-	
-	<div id="widget-title">
-		<%= f.fields_for :title_translations  do |f| %>
-		  <% @site_valid_locales.each do |locale| %>
-				<div class="control-group">
-					<%= label_tag "title-#{locale}", "#{t(:title)}-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
-					<div class="controls">
-						<%= f.text_field locale, :class => 'input-xxlarge', :value => (bulletin.title_translations[locale] rescue nil) %>
-					</div>
-				</div>
-		  <% end %>
-		<% end %>
-	</div>
-	
-	<div id="widget-date">
-		<div class="control-group">
-			<label class="control-label"><%= t(:start) %></label>
-			<div class="controls">
-				<%= f.datetime_select :postdate, { :use_month_numbers => true, :order => [:day, :month, :year] }, :class => 'input-small' %>
-			</div>
-		</div>
-		<div class="control-group">
-			<label class="control-label"><%= t(:end) %></label>
-			<div class="controls">
-				<%= f.datetime_select :deadline, { :use_month_numbers => true, :prompt => { :month => 'Month', :day => 'Day', :year => 'Year'}, :order => [:day, :month, :year] }, :class => 'input-small' %>
-			</div>
-		</div>
-	</div>
-	<% if show_form_status_field(@bulletin)%>
-		<div id="widget-status">
-			<div class="control-group">
-				<label class="control-label"><%= t(:status) %></label>
-				<div class="controls">
-					<label class="checkbox inline"><%= f.check_box :is_hot %><%= t(:hot) %></label>
-					<label class="checkbox inline"><%= f.check_box :is_top %><%= t(:top) %></label>
-					<label class="checkbox inline"><%= f.check_box :is_hidden %><%= t(:hidden) %></label>
-				</div>
-			</div>
-		</div>
-	<% end -%>
-	<!-- <div id="widget-role">
-		<div class="control-group">
-			<label class="control-label">Role</label>
-			<div class="controls">
-				<label class="radio inline"><%= f.radio_button :public, true, :class => 'privacy' %>Public</label>
-				<label class="radio inline"><%= f.radio_button :public, false, :class => 'privacy' %>Private</label>
-				<div class="well select-role" style="display:<%= bulletin.public ? 'none' : 'block' %>;">
-					<label class="checkbox inline"><input type="checkbox" value="student">Student</label>
-					<label class="checkbox inline"><input type="checkbox" value="teacher">Teacher</label>
-					<label class="checkbox inline"><input type="checkbox" value="staff">Staff</label>
-				</div>
-			</div>
-		</div>
-	</div> -->
-</div>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_files.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_files.html.erb
deleted file mode 100644
index 8daa6a266..000000000
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_files.html.erb
+++ /dev/null
@@ -1,26 +0,0 @@
-<div id="qe-file" class="qe-edit-div">
-    <div id="widget-file">
-        <div class="control-group">
-            <table id="bulletin_files" class="table table-condensed">
-                <thead>
-                    <tr>
-                        <th>Chinese</th>
-                        <th>English</th>
-                        <th class="span1"></th>
-                    </tr>
-                </thead>
-                <tfoot>
-                    <tr>
-                        <td style="text-align:center" colspan="3">                            
-							<a class="btn btn-primary btn-small" href="<%= panel_announcement_back_end_bulletin_file_quick_add_path(bulletin) %>#modal-file" data-toggle="modal" data-remote="true"><i class="icon-plus icon-white"></i> <%= t('add')%></a>
-                        </td>
-                    </tr>
-                </tfoot>
-                <tbody>				
-					<%= render :partial => 'list_bulletin_file', :collection => bulletin.bulletin_files %>	
-                </tbody>
-            </table>
-        </div>
-		
-    </div>
-</div>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_links.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_links.html.erb
deleted file mode 100644
index 5fea2ded6..000000000
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_links.html.erb
+++ /dev/null
@@ -1,27 +0,0 @@
-<div id="qe-link" class="qe-edit-div">
-    <div id="widget-link">
-        <div class="control-group">
-            <table id="bulletin_links" class="table table-condensed">
-                <thead>
-                    <tr>
-                        <th>Chinese</th>
-                        <th>English</th>
-                        <th class="span1"></th>
-                    </tr>
-                </thead>
-                <tfoot>
-                    <tr>
-                        <td style="text-align:center" colspan="3">                            
-							<a class="btn btn-primary btn-small" href="<%= panel_announcement_back_end_bulletin_link_quick_add_path(bulletin) %>#modal-link" data-toggle="modal" data-remote="true"><i class="icon-plus icon-white"></i> <%= t('add')%></a>
-                        </td>
-                    </tr>
-                </tfoot>
-                <tbody>
-					<%= render :partial => 'list_bulletin_link', :collection => bulletin.bulletin_links %>					
-                </tbody>
-            </table>
-        </div>
-		
-		
-    </div>
-</div>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_picture.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_picture.html.erb
deleted file mode 100644
index 42359f1c3..000000000
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_picture.html.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-<div id="qe-picture" class="qe-edit-div">
-    <div id="widget-picture clear">
-        <div class="control-group">
-            <!--<label class="control-label">Picture</label>-->
-            <div class="control-group">
-                <div class="controls upload-picture">
-                    <img class="pull-left upload-picture" src="" />
-                </div>
-                <div class="controls file-upload input-prepend">
-				    <label class="control-label add-on btn" for="input-upload">
-					   <%= t(:browse) %>
-					   <%= f.file_field :image, :id => "input-upload", :class => 'upload', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %>
-				    </label>
-                    <span id='fu' class="file-name"></span>
-                    <input name='fu' class="input-medium qe-picture-rename" type="text">
-				    <br>
-				    <% if bulletin.image.file %>
-					   <%= f.check_box :remove_image %>
-					   <%= t('delete.file') %>
-				    <% end %>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_tags.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_tags.html.erb
deleted file mode 100644
index b5a9aa0e9..000000000
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_tags.html.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<div id="qe-tags" class="qe-edit-div">
-	<div id="widget-tags">
-        <div class="controls">
-    		<div class="form-horizontal">
-    			<% @tags.each do |tag| %>
-                <label class="checkbox inline">
-    			<%= check_box_tag 'bulletin[tag_ids][]', tag.id, bulletin.tag_ids.include?(tag.id) %>
-    			<%= tag.name %>
-                </label>
-                <%= hidden_field_tag 'bulletin[tag_ids][]', '' %>
-    			<% end %>
-    		</div>
-        </div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
deleted file mode 100644
index f93bb4cf6..000000000
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<%= render_sort_bar(true, delete_panel_announcement_back_end_bulletins_path(:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]),
-	 ['status', ['is_top', 'is_hot', 'is_hidden', 'is_pending', 'is_checked', 'is_rejected'], 'span1-2', :status],
-													['category', 'bulletin_category', 'span1-2', :category],
-													['title', 'title','span7', :title],
-													['start_date', 'postdate', 'span1-2', :start_date],
-													['end_date', 'deadline', 'span1-2', :end_date],
-													['tags', 'tags', 'span1-2', :tags],
-													['last_modified', 'update_user_id','span1-3', 'last_modified']).html_safe %>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/create_bulletin_file.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/create_bulletin_file.html.erb
deleted file mode 100644
index db5faa85f..000000000
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/create_bulletin_file.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= render :partial => 'list_bulletin_file', :collection => [@bulletin_file] %>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/create_bulletin_file.js.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/create_bulletin_file.js.erb
deleted file mode 100644
index 303a804a5..000000000
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/create_bulletin_file.js.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-$("#modal-file").modal('hide');
-$('<%= j render :partial => 'list_bulletin_file', :collection => [@bulletin_file] %>').appendTo('#bulletin_files').hide().fadeIn();
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/create_bulletin_link.js.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/create_bulletin_link.js.erb
deleted file mode 100644
index 7d38ed6c6..000000000
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/create_bulletin_link.js.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-$("#modal-link").modal('hide');
-$('<%= j render :partial => 'list_bulletin_link', :collection => [@bulletin_link] %>').appendTo('#bulletin_links').hide().fadeIn();
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/edit.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/edit.html.erb
index 13bc51b31..f62321f59 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/edit.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/edit.html.erb
@@ -1,14 +1,5 @@
-<!-- <ul class="breadcrumb">
-	<li><span>Home</span><span class="divider">/</span></li>
-	<li><span>Library</span><span class="divider">/</span></li>
-	<li class="text-blue"><%= t('announcement.editing_announcement') %></li>
-</ul> -->
-<div id="poststuff">
-	<%= form_for @bulletin, :url => panel_announcement_back_end_bulletin_path(@bulletin), :html => {:class => 'clear nccu_ajax_form'} do |f| %>
-		<%= render :partial => 'form', :locals => {:f => f} %>
-	<% end %>
-</div>
-<% content_for :page_specific_javascript do %>
-  <%= javascript_include_tag "bulletin_form" %>
-<% end %>
-
+<%= form_for @bulletin, url: panel_announcement_back_end_bulletin_path(@bulletin), html: {class: "form-horizontal main-forms previewable"} do |f| %>
+  <fieldset>
+    <%= render partial: 'form', locals: {f: f} %>
+  </fieldset>
+<% end %>
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/file_quick_add.js.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/file_quick_add.js.erb
deleted file mode 100644
index 87ded8679..000000000
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/file_quick_add.js.erb
+++ /dev/null
@@ -1 +0,0 @@
-$("#modal-file").html("<%= j render "bulletin_file_qe" %>");
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/file_quick_edit.js.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/file_quick_edit.js.erb
deleted file mode 100644
index 87ded8679..000000000
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/file_quick_edit.js.erb
+++ /dev/null
@@ -1 +0,0 @@
-$("#modal-file").html("<%= j render "bulletin_file_qe" %>");
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
index b2c7aa33b..8f10e0282 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
@@ -1,24 +1,60 @@
-<%= render 'filter' %>
-<table id="bulettin_sort_list" class="table main-list">
-	<%= render 'bulletins' %>
-</table>
-
-<div class="form-actions form-fixed pagination-right">
-	<%= link_to(content_tag(:i, nil, :class => 'icon-plus icon-white') + t(:add), new_panel_announcement_back_end_bulletin_path, :class => 'btn btn-primary pull-right' )if (is_manager? rescue nil)%>
-	<div id="bulletin_pagination" class="paginationFixed">
-		<%= paginate @bulletins, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]} %>
-	</div>
-</div>
-
-<div id="bulletin_link_qe">
-	<div id="modal-link" class="modal fade">
-		<%#= render :partial => "bulletin_link_qe" %>
-	</div>
-</div>
-
-<% content_for :page_specific_javascript do %>
-	<%= javascript_include_tag "bulletin_form" %>
-	<%= javascript_include_tag "/static/jquery.cycle.all.latest.js" %>
-	<%= javascript_include_tag "inc/modal-preview" %>
-<% end %>
+<% set_default_index do 
+	objects @bulletins
+	approvable
+	authorization
+	filterable @bulletin_categories
+	sortable
+	category_field 'bulletin_category'
+	quick_edit_link type: 'edit',
+									link: 'edit_panel_announcement_back_end_bulletin_path'
+	quick_edit_link type: 'detail'
+	quick_edit_link type: 'delete',
+									link: 'panel_announcement_back_end_bulletin_path'
+	quick_edit_link type: 'approval',
+									link: 'panel_announcement_back_end_bulletin_approval_preview_path'
+	quick_edit_link type: 'reject_reason'
+	field type: 'status',
+				db_field: ['is_top', 'is_hot', 'is_hidden', 'is_pending', 'is_checked', 'is_rejected'],
+				translation: 'status',
+				hide: 'phone',
+				sort: 'status'
+				#filter: true
+	field type: 'associated',
+				associated_value: 'title',
+				db_field: 'bulletin_category',
+				translation: 'category',
+				hide: 'phone',
+				sort: 'category'
+				#filter: true
+	field type: 'field',
+				db_field: 'title',
+				translation: 'title',
+				sort: 'title',
+				link: 'panel_announcement_front_end_bulletin_path',
+				quick_edit: true
+	field type: 'date',
+				db_field: 'postdate',
+				translation: 'start_date',
+				hide: 'phone',
+				sort: 'start_date'
+	field type: 'date',
+				db_field: 'deadline',
+				translation: 'end_date',
+				hide: 'phone',
+				sort: 'end_date'
+	field type: 'tags',
+				db_field: 'tags',
+				translation: 'tags',
+				hide: 'all',
+				sort: 'tags'
+				#filter: true
+	field type: 'id',
+				id_model: 'User',
+				db_field: 'update_user_id',
+				translation: 'last_modified',
+				hide: 'phone',
+				sort: 'last_modified'
+	footer link: 'new_panel_announcement_back_end_bulletin_path'
+end %>
 
+<%= render 'admin/default_index/index' %>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.js.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.js.erb
deleted file mode 100644
index 2187d5d6c..000000000
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.js.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-$("#collapse-status").html("<%= j render 'filter_status' %>");
-$("#collapse-category").html("<%= j render 'filter_categories' %>");
-$("#collapse-tags").html("<%= j render 'filter_tags' %>");
-$("#delete_all").attr("action", "<%= delete_panel_announcement_back_end_bulletins_path(:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil, :sort_options => params[:sort_options]) %>");
-$("#sort_headers").html("<%= j render 'sort_headers' %>");
-$("#tbody_bulletins").html("<%= j render :partial => 'bulletin', :collection => @bulletins %>");
-$("#bulletin_pagination").html("<%= j paginate @bulletins, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>");
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/link_quick_add.js.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/link_quick_add.js.erb
deleted file mode 100644
index 4e0f8039c..000000000
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/link_quick_add.js.erb
+++ /dev/null
@@ -1 +0,0 @@
-$("#modal-link").html("<%= j render "bulletin_link_qe" %>");
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/link_quick_edit.js.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/link_quick_edit.js.erb
deleted file mode 100644
index 4e0f8039c..000000000
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/link_quick_edit.js.erb
+++ /dev/null
@@ -1 +0,0 @@
-$("#modal-link").html("<%= j render "bulletin_link_qe" %>");
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/load_quick_edit.js.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/load_quick_edit.js.erb
deleted file mode 100644
index c418a9cc3..000000000
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/load_quick_edit.js.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-$("#<%= dom_id @bulletin, :edit %>").show()
-$("#<%= dom_id @bulletin, :edit %>").html("<%= j render :partial => 'quick_edit', :locals => {:type => @type} %>")
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/new.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/new.html.erb
index 8fc3d044b..8c89dc741 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/new.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/new.html.erb
@@ -1,5 +1,5 @@
-<div id="poststuff">
-<%= form_for @bulletin, :url => panel_announcement_back_end_bulletins_path,:html=>{ :class=>"nccu_ajax_form"} do |f| %>
-	<%= render :partial => 'form', :locals => {:f => f} %>
-<% end %>
-</div>
+<%= form_for @bulletin, url: panel_announcement_back_end_bulletins_path, html: {class: "form-horizontal main-forms previewable"} do |f| %>
+  <fieldset>
+    <%= render partial: 'form', locals: {f: f} %>
+  </fieldset>
+<% end %>
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/update_bulletin_file.js.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/update_bulletin_file.js.erb
deleted file mode 100644
index bcfedb76b..000000000
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/update_bulletin_file.js.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-$("#modal-file").modal('hide');
-$("#<%= dom_id @bulletin_file %>").replaceWith("<%= j render :partial => 'list_bulletin_file', :collection => [@bulletin_file] %>");
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/update_bulletin_link.js.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/update_bulletin_link.js.erb
deleted file mode 100644
index 2f21aec80..000000000
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/update_bulletin_link.js.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-$("#modal-link").modal('hide');
-$("#<%= dom_id @bulletin_link %>").replaceWith("<%= j render :partial => 'list_bulletin_link', :collection => [@bulletin_link] %>");
diff --git a/vendor/built_in_modules/announcement/config/routes.rb b/vendor/built_in_modules/announcement/config/routes.rb
index 8c11ebd05..808f10272 100644
--- a/vendor/built_in_modules/announcement/config/routes.rb
+++ b/vendor/built_in_modules/announcement/config/routes.rb
@@ -26,6 +26,9 @@ Rails.application.routes.draw do
         end
 
         resources :bulletin_categorys do
+          member do
+            post 'toggle'
+          end
           collection do
             get 'get_categorys_json'
           end
diff --git a/vendor/built_in_modules/announcement/init.rb b/vendor/built_in_modules/announcement/init.rb
index eb7bfe5d8..ce8257383 100644
--- a/vendor/built_in_modules/announcement/init.rb
+++ b/vendor/built_in_modules/announcement/init.rb
@@ -21,6 +21,8 @@ module Announcement
     category ["BulletinCategory"]
     data_count 3..10
 
+    taggable
+
     widgets do
       default_widget do
         enable ["typeA","typeC"]
diff --git a/vendor/built_in_modules/archive/init.rb b/vendor/built_in_modules/archive/init.rb
index 4996ef6e1..26f520767 100644
--- a/vendor/built_in_modules/archive/init.rb
+++ b/vendor/built_in_modules/archive/init.rb
@@ -19,6 +19,8 @@ module Archive
 
     category ["ArchiveFileCategory"]
 
+    taggable
+
     widgets do
       # default_widget do
       #   query 'ArchiveFile.all'
diff --git a/vendor/built_in_modules/calendar/init.rb b/vendor/built_in_modules/calendar/init.rb
index 96afb771d..8fd6b2041 100644
--- a/vendor/built_in_modules/calendar/init.rb
+++ b/vendor/built_in_modules/calendar/init.rb
@@ -9,6 +9,8 @@ module Calendar
     author "RD dep"
     intro "I am intro"
     update_info 'some update_info'
+
+    taggable
     
     side_bar do
       head_label_i18n  'calendar.calendar',:icon_class=>"icons-calendar"
diff --git a/vendor/built_in_modules/faq/init.rb b/vendor/built_in_modules/faq/init.rb
index af86b2072..fc7e7562f 100644
--- a/vendor/built_in_modules/faq/init.rb
+++ b/vendor/built_in_modules/faq/init.rb
@@ -36,6 +36,8 @@ module Faq
       #   style ["1"]
       # end
     end
+    
+    taggable
 
     side_bar do
       head_label_i18n  'faq.faq',:icon_class=>"icons-help"
diff --git a/vendor/built_in_modules/gallery/init.rb b/vendor/built_in_modules/gallery/init.rb
index c725f2ee8..8cc3bc727 100644
--- a/vendor/built_in_modules/gallery/init.rb
+++ b/vendor/built_in_modules/gallery/init.rb
@@ -18,6 +18,8 @@ module Gallery
 
     category ["gallery_categories"]
 
+    taggable
+
     widgets do
       # default_widget do
       #   query 'Bulletin.all'
diff --git a/vendor/built_in_modules/web_resource/init.rb b/vendor/built_in_modules/web_resource/init.rb
index ab25d693d..e98697ded 100644
--- a/vendor/built_in_modules/web_resource/init.rb
+++ b/vendor/built_in_modules/web_resource/init.rb
@@ -12,6 +12,8 @@ module WebResource
 
     category ["WebLinkCategory"]
 
+    taggable
+
     widgets do
       # default_widget do
       #   query 'Bulletin.all'