Index: lams_central/web/includes/javascript/jquery-ui.slider.js
===================================================================
diff -u
--- lams_central/web/includes/javascript/jquery-ui.slider.js	(revision 0)
+++ lams_central/web/includes/javascript/jquery-ui.slider.js	(revision 8a65083cf102509e0ca486f636746f56a600c514)
@@ -0,0 +1,6 @@
+/*! jQuery UI - v1.12.1 - 2019-02-01
+* http://jqueryui.com
+* Includes: widget.js, keycode.js, widgets/mouse.js, widgets/slider.js
+* Copyright jQuery Foundation and other contributors; Licensed MIT */
+
+(function(t){"function"==typeof define&&define.amd?define(["jquery"],t):t(jQuery)})(function(t){t.ui=t.ui||{},t.ui.version="1.12.1";var e=0,i=Array.prototype.slice;t.cleanData=function(e){return function(i){var s,n,o;for(o=0;null!=(n=i[o]);o++)try{s=t._data(n,"events"),s&&s.remove&&t(n).triggerHandler("remove")}catch(a){}e(i)}}(t.cleanData),t.widget=function(e,i,s){var n,o,a,r={},l=e.split(".")[0];e=e.split(".")[1];var h=l+"-"+e;return s||(s=i,i=t.Widget),t.isArray(s)&&(s=t.extend.apply(null,[{}].concat(s))),t.expr[":"][h.toLowerCase()]=function(e){return!!t.data(e,h)},t[l]=t[l]||{},n=t[l][e],o=t[l][e]=function(t,e){return this._createWidget?(arguments.length&&this._createWidget(t,e),void 0):new o(t,e)},t.extend(o,n,{version:s.version,_proto:t.extend({},s),_childConstructors:[]}),a=new i,a.options=t.widget.extend({},a.options),t.each(s,function(e,s){return t.isFunction(s)?(r[e]=function(){function t(){return i.prototype[e].apply(this,arguments)}function n(t){return i.prototype[e].apply(this,t)}return function(){var e,i=this._super,o=this._superApply;return this._super=t,this._superApply=n,e=s.apply(this,arguments),this._super=i,this._superApply=o,e}}(),void 0):(r[e]=s,void 0)}),o.prototype=t.widget.extend(a,{widgetEventPrefix:n?a.widgetEventPrefix||e:e},r,{constructor:o,namespace:l,widgetName:e,widgetFullName:h}),n?(t.each(n._childConstructors,function(e,i){var s=i.prototype;t.widget(s.namespace+"."+s.widgetName,o,i._proto)}),delete n._childConstructors):i._childConstructors.push(o),t.widget.bridge(e,o),o},t.widget.extend=function(e){for(var s,n,o=i.call(arguments,1),a=0,r=o.length;r>a;a++)for(s in o[a])n=o[a][s],o[a].hasOwnProperty(s)&&void 0!==n&&(e[s]=t.isPlainObject(n)?t.isPlainObject(e[s])?t.widget.extend({},e[s],n):t.widget.extend({},n):n);return e},t.widget.bridge=function(e,s){var n=s.prototype.widgetFullName||e;t.fn[e]=function(o){var a="string"==typeof o,r=i.call(arguments,1),l=this;return a?this.length||"instance"!==o?this.each(function(){var i,s=t.data(this,n);return"instance"===o?(l=s,!1):s?t.isFunction(s[o])&&"_"!==o.charAt(0)?(i=s[o].apply(s,r),i!==s&&void 0!==i?(l=i&&i.jquery?l.pushStack(i.get()):i,!1):void 0):t.error("no such method '"+o+"' for "+e+" widget instance"):t.error("cannot call methods on "+e+" prior to initialization; "+"attempted to call method '"+o+"'")}):l=void 0:(r.length&&(o=t.widget.extend.apply(null,[o].concat(r))),this.each(function(){var e=t.data(this,n);e?(e.option(o||{}),e._init&&e._init()):t.data(this,n,new s(o,this))})),l}},t.Widget=function(){},t.Widget._childConstructors=[],t.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{classes:{},disabled:!1,create:null},_createWidget:function(i,s){s=t(s||this.defaultElement||this)[0],this.element=t(s),this.uuid=e++,this.eventNamespace="."+this.widgetName+this.uuid,this.bindings=t(),this.hoverable=t(),this.focusable=t(),this.classesElementLookup={},s!==this&&(t.data(s,this.widgetFullName,this),this._on(!0,this.element,{remove:function(t){t.target===s&&this.destroy()}}),this.document=t(s.style?s.ownerDocument:s.document||s),this.window=t(this.document[0].defaultView||this.document[0].parentWindow)),this.options=t.widget.extend({},this.options,this._getCreateOptions(),i),this._create(),this.options.disabled&&this._setOptionDisabled(this.options.disabled),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:function(){return{}},_getCreateEventData:t.noop,_create:t.noop,_init:t.noop,destroy:function(){var e=this;this._destroy(),t.each(this.classesElementLookup,function(t,i){e._removeClass(i,t)}),this.element.off(this.eventNamespace).removeData(this.widgetFullName),this.widget().off(this.eventNamespace).removeAttr("aria-disabled"),this.bindings.off(this.eventNamespace)},_destroy:t.noop,widget:function(){return this.element},option:function(e,i){var s,n,o,a=e;if(0===arguments.length)return t.widget.extend({},this.options);if("string"==typeof e)if(a={},s=e.split("."),e=s.shift(),s.length){for(n=a[e]=t.widget.extend({},this.options[e]),o=0;s.length-1>o;o++)n[s[o]]=n[s[o]]||{},n=n[s[o]];if(e=s.pop(),1===arguments.length)return void 0===n[e]?null:n[e];n[e]=i}else{if(1===arguments.length)return void 0===this.options[e]?null:this.options[e];a[e]=i}return this._setOptions(a),this},_setOptions:function(t){var e;for(e in t)this._setOption(e,t[e]);return this},_setOption:function(t,e){return"classes"===t&&this._setOptionClasses(e),this.options[t]=e,"disabled"===t&&this._setOptionDisabled(e),this},_setOptionClasses:function(e){var i,s,n;for(i in e)n=this.classesElementLookup[i],e[i]!==this.options.classes[i]&&n&&n.length&&(s=t(n.get()),this._removeClass(n,i),s.addClass(this._classes({element:s,keys:i,classes:e,add:!0})))},_setOptionDisabled:function(t){this._toggleClass(this.widget(),this.widgetFullName+"-disabled",null,!!t),t&&(this._removeClass(this.hoverable,null,"ui-state-hover"),this._removeClass(this.focusable,null,"ui-state-focus"))},enable:function(){return this._setOptions({disabled:!1})},disable:function(){return this._setOptions({disabled:!0})},_classes:function(e){function i(i,o){var a,r;for(r=0;i.length>r;r++)a=n.classesElementLookup[i[r]]||t(),a=e.add?t(t.unique(a.get().concat(e.element.get()))):t(a.not(e.element).get()),n.classesElementLookup[i[r]]=a,s.push(i[r]),o&&e.classes[i[r]]&&s.push(e.classes[i[r]])}var s=[],n=this;return e=t.extend({element:this.element,classes:this.options.classes||{}},e),this._on(e.element,{remove:"_untrackClassesElement"}),e.keys&&i(e.keys.match(/\S+/g)||[],!0),e.extra&&i(e.extra.match(/\S+/g)||[]),s.join(" ")},_untrackClassesElement:function(e){var i=this;t.each(i.classesElementLookup,function(s,n){-1!==t.inArray(e.target,n)&&(i.classesElementLookup[s]=t(n.not(e.target).get()))})},_removeClass:function(t,e,i){return this._toggleClass(t,e,i,!1)},_addClass:function(t,e,i){return this._toggleClass(t,e,i,!0)},_toggleClass:function(t,e,i,s){s="boolean"==typeof s?s:i;var n="string"==typeof t||null===t,o={extra:n?e:i,keys:n?t:e,element:n?this.element:t,add:s};return o.element.toggleClass(this._classes(o),s),this},_on:function(e,i,s){var n,o=this;"boolean"!=typeof e&&(s=i,i=e,e=!1),s?(i=n=t(i),this.bindings=this.bindings.add(i)):(s=i,i=this.element,n=this.widget()),t.each(s,function(s,a){function r(){return e||o.options.disabled!==!0&&!t(this).hasClass("ui-state-disabled")?("string"==typeof a?o[a]:a).apply(o,arguments):void 0}"string"!=typeof a&&(r.guid=a.guid=a.guid||r.guid||t.guid++);var l=s.match(/^([\w:-]*)\s*(.*)$/),h=l[1]+o.eventNamespace,c=l[2];c?n.on(h,c,r):i.on(h,r)})},_off:function(e,i){i=(i||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,e.off(i).off(i),this.bindings=t(this.bindings.not(e).get()),this.focusable=t(this.focusable.not(e).get()),this.hoverable=t(this.hoverable.not(e).get())},_delay:function(t,e){function i(){return("string"==typeof t?s[t]:t).apply(s,arguments)}var s=this;return setTimeout(i,e||0)},_hoverable:function(e){this.hoverable=this.hoverable.add(e),this._on(e,{mouseenter:function(e){this._addClass(t(e.currentTarget),null,"ui-state-hover")},mouseleave:function(e){this._removeClass(t(e.currentTarget),null,"ui-state-hover")}})},_focusable:function(e){this.focusable=this.focusable.add(e),this._on(e,{focusin:function(e){this._addClass(t(e.currentTarget),null,"ui-state-focus")},focusout:function(e){this._removeClass(t(e.currentTarget),null,"ui-state-focus")}})},_trigger:function(e,i,s){var n,o,a=this.options[e];if(s=s||{},i=t.Event(i),i.type=(e===this.widgetEventPrefix?e:this.widgetEventPrefix+e).toLowerCase(),i.target=this.element[0],o=i.originalEvent)for(n in o)n in i||(i[n]=o[n]);return this.element.trigger(i,s),!(t.isFunction(a)&&a.apply(this.element[0],[i].concat(s))===!1||i.isDefaultPrevented())}},t.each({show:"fadeIn",hide:"fadeOut"},function(e,i){t.Widget.prototype["_"+e]=function(s,n,o){"string"==typeof n&&(n={effect:n});var a,r=n?n===!0||"number"==typeof n?i:n.effect||i:e;n=n||{},"number"==typeof n&&(n={duration:n}),a=!t.isEmptyObject(n),n.complete=o,n.delay&&s.delay(n.delay),a&&t.effects&&t.effects.effect[r]?s[e](n):r!==e&&s[r]?s[r](n.duration,n.easing,o):s.queue(function(i){t(this)[e](),o&&o.call(s[0]),i()})}}),t.widget,t.ui.keyCode={BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38},t.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase());var s=!1;t(document).on("mouseup",function(){s=!1}),t.widget("ui.mouse",{version:"1.12.1",options:{cancel:"input, textarea, button, select, option",distance:1,delay:0},_mouseInit:function(){var e=this;this.element.on("mousedown."+this.widgetName,function(t){return e._mouseDown(t)}).on("click."+this.widgetName,function(i){return!0===t.data(i.target,e.widgetName+".preventClickEvent")?(t.removeData(i.target,e.widgetName+".preventClickEvent"),i.stopImmediatePropagation(),!1):void 0}),this.started=!1},_mouseDestroy:function(){this.element.off("."+this.widgetName),this._mouseMoveDelegate&&this.document.off("mousemove."+this.widgetName,this._mouseMoveDelegate).off("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(e){if(!s){this._mouseMoved=!1,this._mouseStarted&&this._mouseUp(e),this._mouseDownEvent=e;var i=this,n=1===e.which,o="string"==typeof this.options.cancel&&e.target.nodeName?t(e.target).closest(this.options.cancel).length:!1;return n&&!o&&this._mouseCapture(e)?(this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){i.mouseDelayMet=!0},this.options.delay)),this._mouseDistanceMet(e)&&this._mouseDelayMet(e)&&(this._mouseStarted=this._mouseStart(e)!==!1,!this._mouseStarted)?(e.preventDefault(),!0):(!0===t.data(e.target,this.widgetName+".preventClickEvent")&&t.removeData(e.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(t){return i._mouseMove(t)},this._mouseUpDelegate=function(t){return i._mouseUp(t)},this.document.on("mousemove."+this.widgetName,this._mouseMoveDelegate).on("mouseup."+this.widgetName,this._mouseUpDelegate),e.preventDefault(),s=!0,!0)):!0}},_mouseMove:function(e){if(this._mouseMoved){if(t.ui.ie&&(!document.documentMode||9>document.documentMode)&&!e.button)return this._mouseUp(e);if(!e.which)if(e.originalEvent.altKey||e.originalEvent.ctrlKey||e.originalEvent.metaKey||e.originalEvent.shiftKey)this.ignoreMissingWhich=!0;else if(!this.ignoreMissingWhich)return this._mouseUp(e)}return(e.which||e.button)&&(this._mouseMoved=!0),this._mouseStarted?(this._mouseDrag(e),e.preventDefault()):(this._mouseDistanceMet(e)&&this._mouseDelayMet(e)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,e)!==!1,this._mouseStarted?this._mouseDrag(e):this._mouseUp(e)),!this._mouseStarted)},_mouseUp:function(e){this.document.off("mousemove."+this.widgetName,this._mouseMoveDelegate).off("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,e.target===this._mouseDownEvent.target&&t.data(e.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(e)),this._mouseDelayTimer&&(clearTimeout(this._mouseDelayTimer),delete this._mouseDelayTimer),this.ignoreMissingWhich=!1,s=!1,e.preventDefault()},_mouseDistanceMet:function(t){return Math.max(Math.abs(this._mouseDownEvent.pageX-t.pageX),Math.abs(this._mouseDownEvent.pageY-t.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return!0}}),t.widget("ui.slider",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"slide",options:{animate:!1,classes:{"ui-slider":"ui-corner-all","ui-slider-handle":"ui-corner-all","ui-slider-range":"ui-corner-all ui-widget-header"},distance:0,max:100,min:0,orientation:"horizontal",range:!1,step:1,value:0,values:null,change:null,slide:null,start:null,stop:null},numPages:5,_create:function(){this._keySliding=!1,this._mouseSliding=!1,this._animateOff=!0,this._handleIndex=null,this._detectOrientation(),this._mouseInit(),this._calculateNewMax(),this._addClass("ui-slider ui-slider-"+this.orientation,"ui-widget ui-widget-content"),this._refresh(),this._animateOff=!1},_refresh:function(){this._createRange(),this._createHandles(),this._setupEvents(),this._refreshValue()},_createHandles:function(){var e,i,s=this.options,n=this.element.find(".ui-slider-handle"),o="<span tabindex='0'></span>",a=[];for(i=s.values&&s.values.length||1,n.length>i&&(n.slice(i).remove(),n=n.slice(0,i)),e=n.length;i>e;e++)a.push(o);this.handles=n.add(t(a.join("")).appendTo(this.element)),this._addClass(this.handles,"ui-slider-handle","ui-state-default"),this.handle=this.handles.eq(0),this.handles.each(function(e){t(this).data("ui-slider-handle-index",e).attr("tabIndex",0)})},_createRange:function(){var e=this.options;e.range?(e.range===!0&&(e.values?e.values.length&&2!==e.values.length?e.values=[e.values[0],e.values[0]]:t.isArray(e.values)&&(e.values=e.values.slice(0)):e.values=[this._valueMin(),this._valueMin()]),this.range&&this.range.length?(this._removeClass(this.range,"ui-slider-range-min ui-slider-range-max"),this.range.css({left:"",bottom:""})):(this.range=t("<div>").appendTo(this.element),this._addClass(this.range,"ui-slider-range")),("min"===e.range||"max"===e.range)&&this._addClass(this.range,"ui-slider-range-"+e.range)):(this.range&&this.range.remove(),this.range=null)},_setupEvents:function(){this._off(this.handles),this._on(this.handles,this._handleEvents),this._hoverable(this.handles),this._focusable(this.handles)},_destroy:function(){this.handles.remove(),this.range&&this.range.remove(),this._mouseDestroy()},_mouseCapture:function(e){var i,s,n,o,a,r,l,h,c=this,u=this.options;return u.disabled?!1:(this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()},this.elementOffset=this.element.offset(),i={x:e.pageX,y:e.pageY},s=this._normValueFromMouse(i),n=this._valueMax()-this._valueMin()+1,this.handles.each(function(e){var i=Math.abs(s-c.values(e));(n>i||n===i&&(e===c._lastChangedValue||c.values(e)===u.min))&&(n=i,o=t(this),a=e)}),r=this._start(e,a),r===!1?!1:(this._mouseSliding=!0,this._handleIndex=a,this._addClass(o,null,"ui-state-active"),o.trigger("focus"),l=o.offset(),h=!t(e.target).parents().addBack().is(".ui-slider-handle"),this._clickOffset=h?{left:0,top:0}:{left:e.pageX-l.left-o.width()/2,top:e.pageY-l.top-o.height()/2-(parseInt(o.css("borderTopWidth"),10)||0)-(parseInt(o.css("borderBottomWidth"),10)||0)+(parseInt(o.css("marginTop"),10)||0)},this.handles.hasClass("ui-state-hover")||this._slide(e,a,s),this._animateOff=!0,!0))},_mouseStart:function(){return!0},_mouseDrag:function(t){var e={x:t.pageX,y:t.pageY},i=this._normValueFromMouse(e);return this._slide(t,this._handleIndex,i),!1},_mouseStop:function(t){return this._removeClass(this.handles,null,"ui-state-active"),this._mouseSliding=!1,this._stop(t,this._handleIndex),this._change(t,this._handleIndex),this._handleIndex=null,this._clickOffset=null,this._animateOff=!1,!1},_detectOrientation:function(){this.orientation="vertical"===this.options.orientation?"vertical":"horizontal"},_normValueFromMouse:function(t){var e,i,s,n,o;return"horizontal"===this.orientation?(e=this.elementSize.width,i=t.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)):(e=this.elementSize.height,i=t.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)),s=i/e,s>1&&(s=1),0>s&&(s=0),"vertical"===this.orientation&&(s=1-s),n=this._valueMax()-this._valueMin(),o=this._valueMin()+s*n,this._trimAlignValue(o)},_uiHash:function(t,e,i){var s={handle:this.handles[t],handleIndex:t,value:void 0!==e?e:this.value()};return this._hasMultipleValues()&&(s.value=void 0!==e?e:this.values(t),s.values=i||this.values()),s},_hasMultipleValues:function(){return this.options.values&&this.options.values.length},_start:function(t,e){return this._trigger("start",t,this._uiHash(e))},_slide:function(t,e,i){var s,n,o=this.value(),a=this.values();this._hasMultipleValues()&&(n=this.values(e?0:1),o=this.values(e),2===this.options.values.length&&this.options.range===!0&&(i=0===e?Math.min(n,i):Math.max(n,i)),a[e]=i),i!==o&&(s=this._trigger("slide",t,this._uiHash(e,i,a)),s!==!1&&(this._hasMultipleValues()?this.values(e,i):this.value(i)))},_stop:function(t,e){this._trigger("stop",t,this._uiHash(e))},_change:function(t,e){this._keySliding||this._mouseSliding||(this._lastChangedValue=e,this._trigger("change",t,this._uiHash(e)))},value:function(t){return arguments.length?(this.options.value=this._trimAlignValue(t),this._refreshValue(),this._change(null,0),void 0):this._value()},values:function(e,i){var s,n,o;if(arguments.length>1)return this.options.values[e]=this._trimAlignValue(i),this._refreshValue(),this._change(null,e),void 0;if(!arguments.length)return this._values();if(!t.isArray(arguments[0]))return this._hasMultipleValues()?this._values(e):this.value();for(s=this.options.values,n=arguments[0],o=0;s.length>o;o+=1)s[o]=this._trimAlignValue(n[o]),this._change(null,o);this._refreshValue()},_setOption:function(e,i){var s,n=0;switch("range"===e&&this.options.range===!0&&("min"===i?(this.options.value=this._values(0),this.options.values=null):"max"===i&&(this.options.value=this._values(this.options.values.length-1),this.options.values=null)),t.isArray(this.options.values)&&(n=this.options.values.length),this._super(e,i),e){case"orientation":this._detectOrientation(),this._removeClass("ui-slider-horizontal ui-slider-vertical")._addClass("ui-slider-"+this.orientation),this._refreshValue(),this.options.range&&this._refreshRange(i),this.handles.css("horizontal"===i?"bottom":"left","");break;case"value":this._animateOff=!0,this._refreshValue(),this._change(null,0),this._animateOff=!1;break;case"values":for(this._animateOff=!0,this._refreshValue(),s=n-1;s>=0;s--)this._change(null,s);this._animateOff=!1;break;case"step":case"min":case"max":this._animateOff=!0,this._calculateNewMax(),this._refreshValue(),this._animateOff=!1;break;case"range":this._animateOff=!0,this._refresh(),this._animateOff=!1}},_setOptionDisabled:function(t){this._super(t),this._toggleClass(null,"ui-state-disabled",!!t)},_value:function(){var t=this.options.value;return t=this._trimAlignValue(t)},_values:function(t){var e,i,s;if(arguments.length)return e=this.options.values[t],e=this._trimAlignValue(e);if(this._hasMultipleValues()){for(i=this.options.values.slice(),s=0;i.length>s;s+=1)i[s]=this._trimAlignValue(i[s]);return i}return[]},_trimAlignValue:function(t){if(this._valueMin()>=t)return this._valueMin();if(t>=this._valueMax())return this._valueMax();var e=this.options.step>0?this.options.step:1,i=(t-this._valueMin())%e,s=t-i;return 2*Math.abs(i)>=e&&(s+=i>0?e:-e),parseFloat(s.toFixed(5))},_calculateNewMax:function(){var t=this.options.max,e=this._valueMin(),i=this.options.step,s=Math.round((t-e)/i)*i;t=s+e,t>this.options.max&&(t-=i),this.max=parseFloat(t.toFixed(this._precision()))},_precision:function(){var t=this._precisionOf(this.options.step);return null!==this.options.min&&(t=Math.max(t,this._precisionOf(this.options.min))),t},_precisionOf:function(t){var e=""+t,i=e.indexOf(".");return-1===i?0:e.length-i-1},_valueMin:function(){return this.options.min},_valueMax:function(){return this.max},_refreshRange:function(t){"vertical"===t&&this.range.css({width:"",left:""}),"horizontal"===t&&this.range.css({height:"",bottom:""})},_refreshValue:function(){var e,i,s,n,o,a=this.options.range,r=this.options,l=this,h=this._animateOff?!1:r.animate,c={};this._hasMultipleValues()?this.handles.each(function(s){i=100*((l.values(s)-l._valueMin())/(l._valueMax()-l._valueMin())),c["horizontal"===l.orientation?"left":"bottom"]=i+"%",t(this).stop(1,1)[h?"animate":"css"](c,r.animate),l.options.range===!0&&("horizontal"===l.orientation?(0===s&&l.range.stop(1,1)[h?"animate":"css"]({left:i+"%"},r.animate),1===s&&l.range[h?"animate":"css"]({width:i-e+"%"},{queue:!1,duration:r.animate})):(0===s&&l.range.stop(1,1)[h?"animate":"css"]({bottom:i+"%"},r.animate),1===s&&l.range[h?"animate":"css"]({height:i-e+"%"},{queue:!1,duration:r.animate}))),e=i}):(s=this.value(),n=this._valueMin(),o=this._valueMax(),i=o!==n?100*((s-n)/(o-n)):0,c["horizontal"===this.orientation?"left":"bottom"]=i+"%",this.handle.stop(1,1)[h?"animate":"css"](c,r.animate),"min"===a&&"horizontal"===this.orientation&&this.range.stop(1,1)[h?"animate":"css"]({width:i+"%"},r.animate),"max"===a&&"horizontal"===this.orientation&&this.range.stop(1,1)[h?"animate":"css"]({width:100-i+"%"},r.animate),"min"===a&&"vertical"===this.orientation&&this.range.stop(1,1)[h?"animate":"css"]({height:i+"%"},r.animate),"max"===a&&"vertical"===this.orientation&&this.range.stop(1,1)[h?"animate":"css"]({height:100-i+"%"},r.animate))},_handleEvents:{keydown:function(e){var i,s,n,o,a=t(e.target).data("ui-slider-handle-index");switch(e.keyCode){case t.ui.keyCode.HOME:case t.ui.keyCode.END:case t.ui.keyCode.PAGE_UP:case t.ui.keyCode.PAGE_DOWN:case t.ui.keyCode.UP:case t.ui.keyCode.RIGHT:case t.ui.keyCode.DOWN:case t.ui.keyCode.LEFT:if(e.preventDefault(),!this._keySliding&&(this._keySliding=!0,this._addClass(t(e.target),null,"ui-state-active"),i=this._start(e,a),i===!1))return}switch(o=this.options.step,s=n=this._hasMultipleValues()?this.values(a):this.value(),e.keyCode){case t.ui.keyCode.HOME:n=this._valueMin();break;case t.ui.keyCode.END:n=this._valueMax();break;case t.ui.keyCode.PAGE_UP:n=this._trimAlignValue(s+(this._valueMax()-this._valueMin())/this.numPages);break;case t.ui.keyCode.PAGE_DOWN:n=this._trimAlignValue(s-(this._valueMax()-this._valueMin())/this.numPages);break;case t.ui.keyCode.UP:case t.ui.keyCode.RIGHT:if(s===this._valueMax())return;n=this._trimAlignValue(s+o);break;case t.ui.keyCode.DOWN:case t.ui.keyCode.LEFT:if(s===this._valueMin())return;n=this._trimAlignValue(s-o)}this._slide(e,a,n)},keyup:function(e){var i=t(e.target).data("ui-slider-handle-index");this._keySliding&&(this._keySliding=!1,this._stop(e,i),this._change(e,i),this._removeClass(t(e.target),null,"ui-state-active"))}}})});
\ No newline at end of file
Index: lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -ra6c94a5454507a7c6502caf4c054000f36cc6778 -r8a65083cf102509e0ca486f636746f56a600c514
--- lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision a6c94a5454507a7c6502caf4c054000f36cc6778)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 8a65083cf102509e0ca486f636746f56a600c514)
@@ -13,6 +13,8 @@
 tool.description  =Tool for assessing learners.
 label.authoring.heading  =Assessment Authoring
 label.author.title  =Assessment
+label.enter.question.title  =Enter question's title
+label.enter.question.description  =Enter question's description
 label.authoring.heading.basic  =Basic
 label.authoring.heading.basic.desc  =Basic input information for assessment tool
 label.authoring.heading.advance.desc  =Please input advance options for assessment tool
@@ -21,7 +23,7 @@
 label.authoring.basic.question.text  =Question text
 label.authoring.basic.default.question.grade  =Default question grade
 label.authoring.basic.penalty.factor  =Penalty factor
-label.authoring.basic.general.feedback  =General feedback
+label.authoring.basic.general.feedback  =Enter general feedback
 label.authoring.basic.shuffle.the.choices  =Shuffle answers?
 label.authoring.basic.add.question  =Add question
 label.authoring.basic.question.list.title  =Question list
@@ -54,9 +56,9 @@
 label.authoring.choice.one.answer  =One answer only
 label.authoring.choice.multiple.answers  =Multiple answers allowed
 label.authoring.choice.overall.feedback  =Overall feedback
-label.authoring.choice.feedback.on.correct  =Feedback on any correct response
-label.authoring.choice.feedback.on.partially.correct  =Feedback on any partially correct response
-label.authoring.choice.feedback.on.incorrect  =Feedback on any incorrect response
+label.authoring.choice.feedback.on.correct  =Enter feedback shown on any correct response
+label.authoring.choice.feedback.on.partially.correct  =Enter feedback shown on any partially correct response
+label.authoring.choice.feedback.on.incorrect  =Enter feedback shown on any incorrect response
 label.authoring.choice.add.option  =Add another answer
 label.authoring.matching.pairs.add.matching.pairs  =Add question
 label.authoring.matching.pairs.matching.pairs  =Matching pairs
@@ -72,8 +74,8 @@
 label.authoring.true.false.correct.answer  =Correct answer
 label.authoring.true.false.false  =False
 label.authoring.true.false.true  =True
-label.authoring.true.false.feedback.on.true  =Feedback for the response 'True'.
-label.authoring.true.false.feedback.on.false  =Feedback for the response 'False'.
+label.authoring.true.false.feedback.on.true  =Enter feedback for the response 'True'.
+label.authoring.true.false.feedback.on.false  =Enter feedback for the response 'False'.
 label.authoring.true.false.add.true.false  =Add question
 label.authoring.numerical.question  =Numerical question
 label.authoring.numerical.answers  =Answers
@@ -343,6 +345,8 @@
 outcome.authoring.input  =Search and select by outcome name or code
 outcome.authoring.existing  =Added outcomes
 outcome.authoring.existing.none  =none
+label.do.you.want.to.delete.answer  =Are you sure you want to delete?
+label.settings  =Settings
+label.required.field =Required field
 
-
 #======= End labels: Exported 337 labels for en AU =====
Index: lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rc2dd5ccedb6cfa8bb4df16752c99c2c2d13478a0 -r8a65083cf102509e0ca486f636746f56a600c514
--- lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision c2dd5ccedb6cfa8bb4df16752c99c2c2d13478a0)
+++ lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 8a65083cf102509e0ca486f636746f56a600c514)
@@ -3,7 +3,6 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="classes" required="false" rtexprvalue="true"%>
 <%@ attribute name="placeholder" required="false" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
@@ -68,7 +67,6 @@
 	    if (editor) { editor.destroy(true); }
 	    
 		var instance = CKEDITOR.${method}( "${id}", {
-				//classes                       : "${classes}",
 				width                         : "${width}",
 				height                        : "${height}",
 				toolbar                       : "${toolbarSet}",
Index: lams_tool_assessment/web/common/authoringQuestionHeader.jsp
===================================================================
diff -u
--- lams_tool_assessment/web/common/authoringQuestionHeader.jsp	(revision 0)
+++ lams_tool_assessment/web/common/authoringQuestionHeader.jsp	(revision 8a65083cf102509e0ca486f636746f56a600c514)
@@ -0,0 +1,18 @@
+	<%@ include file="/common/header.jsp"%>
+	<link href="<lams:WebAppURL/>includes/css/addQuestion.css" rel="stylesheet" type="text/css">
+
+	<script type="text/javascript">
+		const QUESTION_TYPE = ${questionType};
+		const ADD_OPTION_URL = "<c:url value='/authoring/addOption.do'/>";
+		const CONFIRM_DELETE_ANSWER_LABEL = "<fmt:message key="label.do.you.want.to.delete.answer"></fmt:message>";
+		const SLIDER_NONE_LABEL = "<fmt:message key="label.authoring.basic.none" />";
+		const VALIDATION_ERROR_LABEL = "<fmt:message key='error.form.validation.error'/>";
+		const VALIDATION_ERRORS_LABEL = "<fmt:message key='error.form.validation.errors'><fmt:param >{errors_counter}</fmt:param></fmt:message>";
+	</script>
+	<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/authoring-question.js"></script>
+	<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/authoring-options.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.slider.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.touch-punch.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/Sortable.js"></script>
\ No newline at end of file
Index: lams_tool_assessment/web/includes/css/addQuestion.scss
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8a65083cf102509e0ca486f636746f56a600c514
--- lams_tool_assessment/web/includes/css/addQuestion.scss	(.../addQuestion.scss)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_assessment/web/includes/css/addQuestion.scss	(.../addQuestion.scss)	(revision 8a65083cf102509e0ca486f636746f56a600c514)
@@ -3,12 +3,7 @@
 div.error {
 	display:none;
 }
-// label.error { 
-// 	color: brand-danger; 
-// 	font-weight: bold; 
-// 	margin-left: 0px;
-// 	display: inline-block;
-// }
+
 em { 
 	font-weight: bold; 
 	padding-right: 1em; 
@@ -22,7 +17,7 @@
 	padding-left: 0;
 }
 .short-input-text {
-	width:10%;
+	width:10% !important;
 }
 
 #max-words-limit-checkbox, #min-words-limit-checkbox {
@@ -36,7 +31,246 @@
 	float: right !important;
 }
 
+.greyed-out-label {
+	opacity: 0.55;
+}
+
 /* overwriting bootstrap value. */
 .panel {
 	margin-bottom: 0 !important;
+}
+.panel-default>.panel-heading {
+	border-color: transparent;
+}
+.input-xs {
+  height: 22px;
+  padding: 2px 5px;
+  font-size: 12px;
+  line-height: 1.5; /* If Placeholder of the input is moved up, rem/modify this. */
+  border-radius: 3px;
+}
+
+/* Remove focus effect from title */
+:focus {
+    outline: 0;
+    /* or */
+    outline: none;
+}
+
+label {
+   	font-weight: initial;
+}
+
+.voffset5-bottom {
+	margin-bottom: 5px;
+}
+
+#title {
+	width: 100%;
+	height: 34px;
+	font-weight: bold;
+}
+#title-container, div.error {
+    padding-right: 80px;
+}
+
+/*Style for text input fields*/
+.borderless-text-input {
+    border: 0;
+}
+
+/* Remove bold style from title field */
+.borderless-text-input::-webkit-input-placeholder {
+    font-weight: normal;
+    color:#999;
+}
+.borderless-text-input::-moz-placeholder {
+    font-weight: normal;
+    color:#999;
+}
+.borderless-text-input:-ms-input-placeholder {
+    font-weight: normal;
+    color:#999;
+}
+.borderless-text-input:-o-input-placeholder {
+    font-weight: normal;
+    color:#999;
+}
+
+.settings-tab {
+	display:none;
+}
+.delete-button {
+	opacity: 0.6;
+	cursor: pointer;
+}
+
+/* hover effect for Settings button  */
+#question-settings-link{
+	margin-top: -10px;
+   	margin-bottom: 5px;
+   	position: absolute;
+   	top: 60px;
+    right: 20px;
+   	z-index: 2;
+   	visibility:hidden;
+}	
+#assessmentQuestionForm:hover #question-settings-link, #question-settings-link.btn-primary {
+	visibility:visible;
+}
+
+/* hover effect for options area */
+.delete-button, .settings-on-hover-hidden{
+	visibility:hidden;
+}	
+#option-table.hover-active tr:hover .delete-button, #option-table.hover-active tr:hover .settings-on-hover-hidden {
+	visibility:visible;
+}
+
+/* Overwrite default CKEditor style */
+div[contenteditable] {
+    display: block;
+    width: 100%;
+    padding: 0;
+	font-size: 14px;
+    line-height: 1.42857143;
+    color: #555;
+    background-color: #fff;
+    background-image: none;
+    border: 0;
+    border-radius: 0;
+    -webkit-box-shadow: inset 0 0 0 rgba(0,0,0,0.075);
+    box-shadow: 0;
+    -webkit-transition: border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;
+    -o-transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
+    transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
+    overflow: hidden;
+    min-height: 60px;
+    -webkit-appearance: textfield;
+}
+
+/*----------STICKY FOOTER----------------*/
+html {
+    position: relative;
+    min-height: 100%;
+}
+body {
+	margin-bottom: 44px;
+}
+footer {
+	position: absolute;
+    bottom: 0;
+    width: 100%;
+    height: 44px;
+    background-color: #f5f5f5;
+}
+footer > div {
+	height: 44px;
+}
+
+/*----------numbers before answers----------------*/
+#option-table table {
+	width: 100%;
+}
+#option-table td:first-child {
+	width: 60px;
+	vertical-align: top;
+}
+#option-table td:first-child span{
+	display: inline-block;
+	width: 4rem;
+	height: 4rem;
+	text-align: center;
+	line-height: 2em;
+	font-size: 1.8rem;
+	color: #fff;
+	border: .2rem solid #313537;
+	-webkit-border-radius: 50%;
+	border-radius: 50%;
+	border-color: #337ab7 !important;
+	background-color: #337ab7 !important;
+}
+
+/*----------SORTABLE----------------*/
+/* prevent inserting text into CKEditors */
+.sortable-placeholder .option-ckeditor {
+	pointer-events: none
+}
+.sortable-chosen {
+	background-color: #fff;
+}
+.sortable-placeholder {
+	background-color: rgba(241, 241, 241, 0.7);
+}
+
+/*----------SLIDER----------------*/
+
+.ui-widget-content {
+	border: 0.03em solid #bdc3c7;
+	background: #e1e1e1;
+	color: #222222;
+	margin-top: -0.03em;
+	padding: 0.08em;
+}
+
+.ui-state-default, .ui-widget-content .ui-state-default{
+	background:transparent !important;
+	border:none !important;
+}
+.ui-slider .ui-slider-handle label{
+    background: #c3c3c3;
+    border-radius: 20px;
+    width:5.2em;
+}
+
+.ui-slider .ui-slider-handle {
+	position: absolute;
+	z-index: 2;
+	width: 5.2em;
+	height: 100px;
+	cursor: default;
+	margin: 0 -40px auto !important;
+	text-align: center;	
+	line-height: 28px;
+	color: #FFFFFF;
+}
+
+.ui-slider .ui-slider-handle .fa {
+	color: #FFFFFF;
+    margin: 0 3px;
+    font-size: 18px;
+    opacity: 0.5;
+    font-weight: bolder;
+}
+
+.ui-slider-horizontal .ui-slider-handle {
+	top: -.9em;
+}
+
+.ui-state-default, .ui-widget-content .ui-state-default {
+	border: 1px solid #f9f9f9;
+	background: #3498db;
+}
+
+.ui-slider-horizontal .ui-slider-handle {
+	margin-left: -0.5em;
+}
+
+.ui-slider .ui-slider-handle {
+	cursor: pointer;
+}
+
+.ui-slider a, .ui-slider a:focus {
+	cursor: pointer;
+	outline: none;
+}
+
+.grade-slider {
+    height: 30px;
+    padding-top: 15px;
+}
+
+.grade-slider>div:first-child {
+	margin-top: -7px;
+	padding: 0;
 }
\ No newline at end of file
Fisheye: Tag 8a65083cf102509e0ca486f636746f56a600c514 refers to a dead (removed) revision in file `lams_tool_assessment/web/includes/javascript/assessmentoption.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_assessment/web/includes/javascript/authoring-options.js
===================================================================
diff -u
--- lams_tool_assessment/web/includes/javascript/authoring-options.js	(revision 0)
+++ lams_tool_assessment/web/includes/javascript/authoring-options.js	(revision 8a65083cf102509e0ca486f636746f56a600c514)
@@ -0,0 +1,136 @@
+// NOTE. In order for this JS file to work properly, please, define the following 4 constants in jsp: 
+// QUESTION_TYPE, ADD_OPTION_URL, CONFIRM_DELETE_ANSWER_LABEL, SLIDER_NONE_LABEL
+$(document).ready(function(){
+	initializeAnswers();
+});
+
+function removeOption(idx){
+	var	deletionConfirmed = confirm(CONFIRM_DELETE_ANSWER_LABEL);
+	if (deletionConfirmed) {
+		$("#option-table-" + idx).remove();
+	}
+}
+	
+function addOption(){
+	//store old InstanceIds before doing Ajax call. We need to keep record of old ones to prevent reinitializing new CKEditor two times.
+	var oldOptionIds = new Array();
+		for (var instanceId in CKEDITOR.instances){
+		oldOptionIds[instanceId] = instanceId;
+	}
+
+	var contentFolderID= $("#contentFolderID").val();
+	prepareOptionEditorsForAjaxSubmit();
+	var optionList = $("#optionForm").serialize(true);
+	$.ajaxSetup({ cache: true });
+	$("#optionArea").load(
+		ADD_OPTION_URL,
+		{
+			contentFolderID: contentFolderID,
+			questionType: QUESTION_TYPE,
+			optionList: optionList 
+		}, 
+		function() {
+			initializeAnswers();
+		}
+	);
+}
+	
+//in order to be able to use option's value, copy it from CKEditor to textarea
+function prepareOptionEditorsForAjaxSubmit(){
+	if ((QUESTION_TYPE == 1) || (QUESTION_TYPE == 7) || (QUESTION_TYPE == 8)) {
+		$("textarea[name^=optionString], textarea[name^=optionFeedback]").each(function()  {
+			prepareOptionEditorForAjaxSubmit(this);
+		});
+			
+	} else if (QUESTION_TYPE == 2) {
+		$("[name^=optionQuestion]").each(function() {
+			prepareOptionEditorForAjaxSubmit(this);
+		});
+			
+	} else if ((QUESTION_TYPE == 3) || (QUESTION_TYPE == 4)) {
+		$("[name^=optionFeedback]").each(function() {
+			prepareOptionEditorForAjaxSubmit(this);
+		});
+	}
+}
+function prepareOptionEditorForAjaxSubmit(ckeditor){
+	var ckeditorData = CKEDITOR.instances[ckeditor.name].getData();
+	//skip out empty values
+	ckeditor.value = ((ckeditorData == null) || (ckeditorData.replace(/&nbsp;| |<br \/>|\s|<p>|<\/p>|\xa0/g, "").length == 0)) ? "" : ckeditorData;
+}
+
+function initializeAnswers() {
+	
+
+	//check if jquery-ui.slider.js library is loaded
+	if (typeof(jQuery.ui.slider) != 'undefined'){
+		//init grading slider
+	    $(".slider").slider({
+	        animate: true,
+	        min: -1,
+	        max: 1,
+	        step: 0.05,
+	        create: function(event, ui){
+	        	//get initial value from the responsible form input
+	           	var initialValue = $(this).next("input").val();
+	           	$(this).slider('value', initialValue);
+	        }
+	    }).on('slide',function(event,ui){
+	        //ui is not available at the initial call 
+	        var newValueInt = ui ? eval(ui.value) : eval($(this).slider('value'));
+		        
+	        //prepare string value
+	        var newValue;
+	        switch (newValueInt) {
+			  case 0:
+				newValue = " " + SLIDER_NONE_LABEL + " ";
+			    break;
+			  case 1:
+			  case -1:
+				newValue = parseInt(newValueInt*100) + " %";
+				break;
+			  default:
+				newValue = " " + parseInt(newValueInt*100) + " % ";
+			}
+		        
+			//update slider's label
+	       	$('span', $(this)).html('<label><span class="fa fa-angle-left"></span><span>'+newValue+'</span><span class="fa fa-angle-right"></span></label>');
+	
+	       	//update input with the new value, it it's not initial call
+	       	if (ui) {
+	        	$(this).next("input").val(ui.value);
+	       	}
+	    });
+	    //update slider's label with the initial value
+	    $('.slider').trigger('slide');
+	}
+    
+    //init options sorting feature
+    new Sortable(document.getElementById('option-table'), {
+	    animation: 150,
+	    ghostClass: 'sortable-placeholder',
+	    direction: 'vertical',
+		onStart: function (evt) {
+			//stop answers' hover effect, once element dragging started
+			$("#option-table").removeClass("hover-active");
+		},
+		onEnd: function (evt) {
+			//activate answers' hover effect, once element dragging ended
+			$("#option-table").delay(50).queue(function(next){
+			    $(this).addClass("hover-active");
+			    next();
+			});
+		},
+		store: {
+			set: function (sortable) {
+				//update all sequenceIds in order to later save it as options' order
+				var order = sortable.toArray();
+				for (var i = 0; i < order.length; i++) {
+				    var optionIndex = order[i];
+				    $('input[name="optionSequenceId' + optionIndex + '"]').val(i+1);
+				}
+			}
+		}
+	});
+
+}
Index: lams_tool_assessment/web/includes/javascript/authoring-question.js
===================================================================
diff -u
--- lams_tool_assessment/web/includes/javascript/authoring-question.js	(revision 0)
+++ lams_tool_assessment/web/includes/javascript/authoring-question.js	(revision 8a65083cf102509e0ca486f636746f56a600c514)
@@ -0,0 +1,48 @@
+//in order to use this js file, define const VALIDATION_ERROR_LABEL and VALIDATION_ERRORS_LABEL
+
+$(document).ready(function(){
+	$("#question-settings-link").on('click', function() {
+		$('.question-tab:visible').fadeToggle("fast", function() {
+			$( ".settings-tab" ).show();
+	    });
+		$('.settings-tab:visible').fadeToggle("fast", function() {
+			$( ".question-tab" ).show();
+	    });
+
+		//toggle Settings button class
+		$(this).toggleClass("btn-default btn-primary");
+	});
+});
+
+// post-submit callback 
+function afterRatingSubmit(responseText, statusText)  { 
+	self.parent.refreshThickbox()
+	self.parent.tb_remove();
+}
+
+//form validation handler. It's called when the form contains an error.
+function formInvalidHandler(form, validator) {
+    var errors = validator.numberOfInvalids();
+    if (errors) {
+        var message = errors == 1
+			? VALIDATION_ERROR_LABEL
+          	: VALIDATION_ERRORS_LABEL.replace("{errors_counter}", errors);
+      	  
+        $("div.error span").html(message);
+        $("div.error").show();
+          
+        //show/hide settings tab, if it contains an error
+        var showSettingsTab = true;
+        $.each(validator.errorMap, function(key, value) {
+        	showSettingsTab &= key == "defaultGrade" || key == "penaltyFactor";
+        });
+        if (showSettingsTab) {
+        	$("#question-settings-link.btn-default").trigger( "click" );
+        } else {
+        	$("#question-settings-link.btn-primary").trigger( "click" );
+	    }
+          
+    } else {
+        $("div.error").hide();
+    }
+}
\ No newline at end of file
Index: lams_tool_assessment/web/pages/authoring/parts/addessay.jsp
===================================================================
diff -u -rdfcdbcb8e8c78950620a1013c07763d43eda55f2 -r8a65083cf102509e0ca486f636746f56a600c514
--- lams_tool_assessment/web/pages/authoring/parts/addessay.jsp	(.../addessay.jsp)	(revision dfcdbcb8e8c78950620a1013c07763d43eda55f2)
+++ lams_tool_assessment/web/pages/authoring/parts/addessay.jsp	(.../addessay.jsp)	(revision 8a65083cf102509e0ca486f636746f56a600c514)
@@ -7,12 +7,18 @@
 	<%@ include file="/common/header.jsp"%>
 	<link href="<lams:WebAppURL/>includes/css/addQuestion.css" rel="stylesheet" type="text/css">
 
+	<script type="text/javascript">
+		const VALIDATION_ERROR_LABEL = "<fmt:message key='error.form.validation.error'/>";
+		const VALIDATION_ERRORS_LABEL = "<fmt:message key='error.form.validation.errors'><fmt:param >{errors_counter}</fmt:param></fmt:message>";
+	</script>
+	<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/authoring-question.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
     <script>
-			$(document).ready(function(){
-		    	$("#assessmentQuestionForm").validate({
+		$(document).ready(function(){
+		    $("#assessmentQuestionForm").validate({
+		    		ignore: 'hidden',
 		    		rules: {
 		    			title: "required",
 		    			defaultGrade: {
@@ -27,19 +33,7 @@
 		    				digits: "<fmt:message key='label.authoring.choice.enter.integer'/>"
 		    			}
 		    		},
-		    	    invalidHandler: function(form, validator) {
-		    		      var errors = validator.numberOfInvalids();
-		    		      if (errors) {
-		    		          var message = errors == 1
-		    		          	  ? "<fmt:message key='error.form.validation.error'/>"
-		    		          	  : "<fmt:message key='error.form.validation.errors'><fmt:param >" + errors + "</fmt:param></fmt:message>";
-	    		          	  
-		    		          $("div.error span").html(message);
-		    		          $("div.error").show();
-		    		      } else {
-		    		          $("div.error").hide();
-		    		      }
-		    		},
+		    	    invalidHandler: formInvalidHandler,
 		    		debug: true,
 		    		errorClass: "alert alert-danger",
      			    submitHandler: function(form) {
@@ -53,7 +47,7 @@
 		    		    				
 		    			$('#assessmentQuestionForm').ajaxSubmit(options);
 		    		}
-		  		});
+		  	});
 		    	
 		    	//spinner
 		    	var validateMinMax = function() {
@@ -94,116 +88,122 @@
 		    			minimumWordsSpinner.spinner( "disable" );
 		    		}
 		        });
-			});
-			
-    		// post-submit callback 
-    		function afterRatingSubmit(responseText, statusText)  { 
-    			self.parent.refreshThickbox();
-    			self.parent.tb_remove();
-    		}
+		});
   	</script>
-		
 </lams:head>
 	
 <body>
-	<div class="panel panel-default add-file">
+	<div class="panel-default add-file">
 		<div class="panel-heading panel-title">
 			<fmt:message key="label.authoring.basic.type.essay" />
 		</div>
 			
 		<div class="panel-body">
-			<lams:errors/>
 			
 			<form:form action="saveOrUpdateQuestion.do" method="post" modelAttribute="assessmentQuestionForm" id="assessmentQuestionForm">
 				<c:set var="sessionMap" value="${sessionScope[assessmentQuestionForm.sessionMapID]}" />
 				<c:set var="isAuthoringRestricted" value="${sessionMap.isAuthoringRestricted}" />
 				<form:hidden path="sessionMapID" />
 				<form:hidden path="questionType" value="6"/>
 				<form:hidden path="sequenceId" />
-				
-				<div class="form-group">
-				    <label for="title">
-				    	<fmt:message key="label.authoring.basic.question.name"/>
-				    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
-				    </label>
-				    <form:input path="title" maxlength="255" id="title" cssClass="form-control" tabindex="1"/>
-				</div>
-			
-				<div class="form-group">
-					<label for="question">
-						<fmt:message key="label.authoring.basic.question.text" />
-					</label>
-		            	
-					<lams:CKEditor id="question" value="${assessmentQuestionForm.question}" contentFolderID="${assessmentQuestionForm.contentFolderID}" />
-				</div>
-				
-				<div class="checkbox">
-					<label for="answer-required">
-						<form:checkbox path="answerRequired" id="answer-required"/>
-						<fmt:message key="label.authoring.answer.required" />
-					</label>
-				</div>
 
-				<c:if test="${!isAuthoringRestricted}">
-					<div class="form-group form-inline">
-					    <label for="defaultGrade">
-					    	<fmt:message key="label.authoring.basic.default.question.grade" />:
-					    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
-					    </label>
-					    <form:input path="defaultGrade" cssClass="form-control short-input-text input-sm"/>
+				<button type="button" id="question-settings-link" class="btn btn-default btn-sm">
+					<fmt:message key="label.settings" />
+				</button>
+				
+				<div class="question-tab">
+					<lams:errors/>
+					 <div class="error">
+				    	<lams:Alert id="errorMessages" type="danger" close="false" >
+							<span></span>
+						</lams:Alert>	
+				    </div>
+					
+					<div id="title-container" class="form-group">
+						<c:set var="TITLE_LABEL"><fmt:message key="label.enter.question.title"/> </c:set>
+					    <form:input path="title" id="title" cssClass="borderless-text-input" tabindex="1" maxlength="255" 
+					    	placeholder="${TITLE_LABEL}"/>
 					</div>
-				</c:if>
 				
-				<div class="checkbox">
-					<label for="allow-rich-editor">
-						<form:checkbox path="allowRichEditor" id="allow-rich-editor"/>
-						<fmt:message key="label.authoring.basic.allow.learners.rich.editor" />
-					</label>
+					<div class="form-group">
+						<c:set var="QUESTION_DESCRIPTION_LABEL"><fmt:message key="label.enter.question.description"/></c:set>
+						<lams:CKEditor id="question" value="${assessmentQuestionForm.question}" contentFolderID="${assessmentQuestionForm.contentFolderID}" 
+							placeholder="${QUESTION_DESCRIPTION_LABEL}"	 />
+					</div>
 				</div>
 				
-				<div class="checkbox">
-				    <label for="max-words-limit-checkbox">
-						<input type="checkbox" id="max-words-limit-checkbox" name="noname"
-								<c:if test="${assessmentQuestionForm.maxWordsLimit != 0}">checked="checked"</c:if>/>
-				    	<fmt:message key="label.maximum.number.words" />
-				    </label>
-				    <form:input path="maxWordsLimit" id="max-words-limit"/>
-				</div>
-				
-				<div class="checkbox">
-				    <label for="min-words-limit-checkbox">
-						<input type="checkbox" id="min-words-limit-checkbox" name="noname"
-								<c:if test="${assessmentQuestionForm.minWordsLimit != 0}">checked="checked"</c:if>/>
-				    	<fmt:message key="label.minimum.number.words" />
-				    </label>
-				    <form:input path="minWordsLimit" id="min-words-limit"/>
-				</div>
-
-				<div class="generalFeedback">
-				  <a data-toggle="collapse" data-target="#general-feedback" href="#general-fdback"><i class="fa fa-xs fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.basic.general.feedback" /></a>
-					<div id="general-feedback"  class="voffset5 collapse <c:if test="${not empty assessmentQuestionForm.generalFeedback}">in</c:if> form-group">
-						<lams:CKEditor id="generalFeedback" value="${assessmentQuestionForm.generalFeedback}" contentFolderID="${assessmentQuestionForm.contentFolderID}" />
+				<div class="settings-tab">
+					 <div class="error">
+				    	<lams:Alert id="errorMessages" type="danger" close="false" >
+							<span></span>
+						</lams:Alert>	
+				    </div>
+				    
+					<div class="checkbox">
+						<label for="answer-required">
+							<form:checkbox path="answerRequired" id="answer-required"/>
+							<fmt:message key="label.authoring.answer.required" />
+						</label>
 					</div>
+	
+					<c:if test="${!isAuthoringRestricted}">
+						<div class="form-group form-inline">
+						    <label for="defaultGrade">
+						    	<fmt:message key="label.authoring.basic.default.question.grade" />:
+						    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
+						    </label>
+						    <form:input path="defaultGrade" cssClass="form-control short-input-text input-sm"/>
+						</div>
+					</c:if>
+					
+					<div class="checkbox">
+						<label for="allow-rich-editor">
+							<form:checkbox path="allowRichEditor" id="allow-rich-editor"/>
+							<fmt:message key="label.authoring.basic.allow.learners.rich.editor" />
+						</label>
+					</div>
+					
+					<div class="checkbox">
+					    <label for="max-words-limit-checkbox">
+							<input type="checkbox" id="max-words-limit-checkbox" name="noname"
+									<c:if test="${assessmentQuestionForm.maxWordsLimit != 0}">checked="checked"</c:if>/>
+					    	<fmt:message key="label.maximum.number.words" />
+					    </label>
+					    <form:input path="maxWordsLimit" id="max-words-limit"/>
+					</div>
+					
+					<div class="checkbox">
+					    <label for="min-words-limit-checkbox">
+							<input type="checkbox" id="min-words-limit-checkbox" name="noname"
+									<c:if test="${assessmentQuestionForm.minWordsLimit != 0}">checked="checked"</c:if>/>
+					    	<fmt:message key="label.minimum.number.words" />
+					    </label>
+					    <form:input path="minWordsLimit" id="min-words-limit"/>
+					</div>
+	
+					<div class="voffset5 form-group">
+						<c:set var="GENERAL_FEEDBACK_LABEL"><fmt:message key="label.authoring.basic.general.feedback"/></c:set>
+						<lams:CKEditor id="generalFeedback" value="${assessmentQuestionForm.generalFeedback}" 
+							placeholder="${GENERAL_FEEDBACK_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}" />
+					</div>
 				</div>
 					
 			</form:form>
-			
-			<div class="voffset10 pull-right">
+
+		</div>		
+	</div>	
+	
+	<footer class="footer fixed-bottom">
+		<div class="panel-heading">
+        	<div class="pull-right">
 			    <a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
 					<fmt:message key="label.cancel" />
 				</a>
 				<a href="#nogo" onclick="javascript:$('#assessmentQuestionForm').submit();" class="btn btn-sm btn-default button-add-item">
 					<fmt:message key="label.authoring.save.button" />
 				</a>
-				
-			</div>
-
-		</div>
-		<!--closes content-->
-	
-		<div id="footer">
-		</div>
-		<!--closes footer-->		
-	</div>	
+			</div>	
+      	</div>
+    </footer>
 </body>
 </lams:html>
Index: lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp
===================================================================
diff -u -r67d7232f087b9f5c72ff41f7bbebe29cff81e099 -r8a65083cf102509e0ca486f636746f56a600c514
--- lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp	(.../addmarkhedging.jsp)	(revision 67d7232f087b9f5c72ff41f7bbebe29cff81e099)
+++ lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp	(.../addmarkhedging.jsp)	(revision 8a65083cf102509e0ca486f636746f56a600c514)
@@ -4,23 +4,11 @@
 
 <lams:html>
 <lams:head>
-	<%@ include file="/common/header.jsp"%>
-	<link href="<lams:WebAppURL/>includes/css/addQuestion.css" rel="stylesheet" type="text/css">
-
-	<script type="text/javascript">
-		var questionType = ${questionType};
-		var addOptionUrl = "<c:url value='/authoring/addOption.do'/>";
-	   	var removeOptionUrl = "<c:url value='/authoring/removeOption.do'/>";
-   	    var upOptionUrl = "<c:url value='/authoring/upOption.do'/>";
-   	    var downOptionUrl = "<c:url value='/authoring/downOption.do'/>";
-	</script>
-	<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/assessmentoption.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
+	<%@ include file="/common/authoringQuestionHeader.jsp"%>
     <script>
 		$(document).ready(function(){
-				
-		    	$("#assessmentQuestionForm").validate({
+		    $("#assessmentQuestionForm").validate({
+		    		ignore: 'hidden',
 		    		rules: {
 		    			title: "required",
 		    			defaultGrade: {
@@ -44,29 +32,17 @@
 		    				required: "<fmt:message key='label.authoring.numerical.error.answer'/>"
 		    			}
 		    		},
-		    	    invalidHandler: function(form, validator) {
-		    		      var errors = validator.numberOfInvalids();
-		    		      if (errors) {
-		    		          var message = errors == 1
-		    		          	  ? "<fmt:message key='error.form.validation.error'/>"
-		    		          	  : "<fmt:message key='error.form.validation.errors'><fmt:param >" + errors + "</fmt:param></fmt:message>";
-	    		          	  
-		    		          $("div.error span").html(message);
-		    		          $("div.error").show();
-		    		      } else {
-		    		          $("div.error").hide();
-		    		      }
-		    		},
+		    	    invalidHandler: formInvalidHandler,
 		    		debug: true,
 		    		errorClass: "alert alert-danger",
      			    submitHandler: function(form) {
      			    	prepareOptionEditorsForAjaxSubmit();
 		    			$("#optionList").val($("#optionForm").serialize(true));
 		    			$("#question").val(CKEDITOR.instances.question.getData());
 		    			$("#generalFeedback").val(CKEDITOR.instances.generalFeedback.getData());
-		    			$("#feedbackOnCorrect").val(CKEDITOR.instances.feedbackOnCorrectOutsideForm.getData());
-		    			$("#feedbackOnPartiallyCorrect").val(CKEDITOR.instances.feedbackOnPartiallyCorrectOutsideForm.getData());
-		    			$("#feedbackOnIncorrect").val(CKEDITOR.instances.feedbackOnIncorrectOutsideForm.getData());
+		    			$("#feedbackOnCorrect").val(CKEDITOR.instances.feedbackOnCorrect.getData());
+		    			$("#feedbackOnPartiallyCorrect").val(CKEDITOR.instances.feedbackOnPartiallyCorrect.getData());
+		    			$("#feedbackOnIncorrect").val(CKEDITOR.instances.feedbackOnIncorrect.getData());
 		    			
 		    	    	var options = { 
 		    	    		target:  parent.jQuery('#questionListArea'), 
@@ -75,31 +51,17 @@
 		    		    				
 		    			$('#assessmentQuestionForm').ajaxSubmit(options);
 		    		}
-		  		});
-		    	
-			});
-		
-    		// post-submit callback 
-    		function afterRatingSubmit(responseText, statusText)  { 
-    			self.parent.refreshThickbox()
-    			self.parent.tb_remove();
-    		}    
+		  		});    	
+		});   
  	</script>
-		
 </lams:head>
 <body>
-	<div class="panel panel-default add-file">
+	<div class="panel-default add-file">
 		<div class="panel-heading panel-title">
-			<fmt:message key="label.authoring.basic.type.multiple.choice" />
+			<fmt:message key="label.authoring.basic.type.mark.hedging" />
 		</div>
 			
 		<div class="panel-body">
-			<lams:errors/>
-		    <div class="error">
-		    	<lams:Alert id="errorMessages" type="danger" close="false" >
-					<span></span>
-				</lams:Alert>	
-		    </div>		
 			
 			<form:form action="saveOrUpdateQuestion.do" method="post" modelAttribute="assessmentQuestionForm" id="assessmentQuestionForm">
 				<c:set var="sessionMap" value="${sessionScope[assessmentQuestionForm.sessionMapID]}" />
@@ -109,123 +71,125 @@
 				<input type="hidden" name="optionList" id="optionList" />
 				<form:hidden path="sequenceId" />
 				<form:hidden path="contentFolderID" id="contentFolderID"/>
-				<form:hidden path="feedbackOnCorrect" id="feedbackOnCorrect"/>
-				<form:hidden path="feedbackOnPartiallyCorrect" id="feedbackOnPartiallyCorrect"/>
-				<form:hidden path="feedbackOnIncorrect" id="feedbackOnIncorrect"/>
+
+				<button type="button" id="question-settings-link" class="btn btn-default btn-sm">
+					<fmt:message key="label.settings" />
+				</button>
 				
-				<div class="form-group">
-				    <label for="title">
-				    	<fmt:message key="label.authoring.basic.question.name"/>
-				    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
-				    </label>
-				    <form:input path="title" id="title" cssClass="form-control" tabindex="1"/>
-				</div>
-			
-				<div class="form-group">
-					<label for="question">
-						<fmt:message key="label.authoring.basic.question.text" />
-					</label>
-		            	
-					<lams:CKEditor id="question" value="${assessmentQuestionForm.question}" contentFolderID="${assessmentQuestionForm.contentFolderID}" />
-				</div>
+				<div class="question-tab">
+					<lams:errors/>
+					 <div class="error">
+				    	<lams:Alert id="errorMessages" type="danger" close="false" >
+							<span></span>
+						</lams:Alert>	
+				    </div>
+					
+					<div id="title-container" class="form-group">
+						<c:set var="TITLE_LABEL"><fmt:message key="label.enter.question.title"/> </c:set>
+					    <form:input path="title" id="title" cssClass="borderless-text-input" tabindex="1" maxlength="255" 
+					    	placeholder="${TITLE_LABEL}"/>
+					</div>
 				
-				<div class="checkbox">
-					<label for="answer-required">
-						<form:checkbox path="answerRequired" id="answer-required"/>
-						<fmt:message key="label.authoring.answer.required" />
-					</label>
-				</div>
-
-				<c:if test="${!isAuthoringRestricted}">
-					<div class="form-group form-inline">
-					    <label for="defaultGrade">
-					    	<fmt:message key="label.authoring.basic.default.question.grade" />:
-					    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
-					    </label>
-					    <form:input path="defaultGrade" cssClass="form-control short-input-text input-sm"/>
+					<div class="form-group">
+						<c:set var="QUESTION_DESCRIPTION_LABEL"><fmt:message key="label.enter.question.description"/></c:set>
+						<lams:CKEditor id="question" value="${assessmentQuestionForm.question}" contentFolderID="${assessmentQuestionForm.contentFolderID}" 
+							placeholder="${QUESTION_DESCRIPTION_LABEL}"	 />
 					</div>
-				</c:if>
 					
-				<div class="checkbox">
-					<label for="shuffle">
-						<form:checkbox path="shuffle" id="shuffle"/>
-						<fmt:message key="label.authoring.basic.shuffle.the.choices" />
-					</label>
+					<input type="text" name="hasOptionFilled" id="hasOptionFilled" class="fake-validation-input">
 				</div>
 				
-				<div class="checkbox">
-					<label for="hedging-justification">
-						<form:checkbox path="hedgingJustificationEnabled" id="hedging-justification"/>
-						<fmt:message key="label.ask.for.hedging.justification" />
-					</label>
-				</div>
-
-				<div class="generalFeedback">
-				  <a data-toggle="collapse" data-target="#general-feedback" href="#general-fdback"><i class="fa fa-xs fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.basic.general.feedback" /></a>
-					<div id="general-feedback"  class="voffset5 collapse form-group <c:if test="${not empty assessmentQuestionForm.generalFeedback}">in</c:if>">
-						<lams:CKEditor id="generalFeedback" value="${assessmentQuestionForm.generalFeedback}" contentFolderID="${assessmentQuestionForm.contentFolderID}" />
+				<div class="settings-tab">
+					 <div class="error">
+				    	<lams:Alert id="errorMessages" type="danger" close="false" >
+							<span></span>
+						</lams:Alert>	
+				    </div>
+				    
+					<div class="checkbox">
+						<label for="answer-required">
+							<form:checkbox path="answerRequired" id="answer-required"/>
+							<fmt:message key="label.authoring.answer.required" />
+						</label>
 					</div>
-				</div>
-				
-				<h5 class="voffset20">
-					<fmt:message key="label.authoring.basic.answer.options" />
-				</h5>
-				<input type="text" name="hasOptionFilled" id="hasOptionFilled" class="fake-validation-input">
-			</form:form>
+	
+					<c:if test="${!isAuthoringRestricted}">
+						<div class="form-group form-inline">
+						    <label for="defaultGrade">
+						    	<fmt:message key="label.authoring.basic.default.question.grade" />:
+						    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
+						    </label>
+						    <form:input path="defaultGrade" cssClass="form-control short-input-text input-sm"/>
+						</div>
+					</c:if>
+						
+					<div class="checkbox">
+						<label for="shuffle">
+							<form:checkbox path="shuffle" id="shuffle"/>
+							<fmt:message key="label.authoring.basic.shuffle.the.choices" />
+						</label>
+					</div>
+					
+					<div class="checkbox">
+						<label for="hedging-justification">
+							<form:checkbox path="hedgingJustificationEnabled" id="hedging-justification"/>
+							<fmt:message key="label.ask.for.hedging.justification" />
+						</label>
+					</div>
+	
+					<div class="voffset5 form-group">
+						<c:set var="GENERAL_FEEDBACK_LABEL"><fmt:message key="label.authoring.basic.general.feedback"/></c:set>
+						<lams:CKEditor id="generalFeedback" value="${assessmentQuestionForm.generalFeedback}" 
+							placeholder="${GENERAL_FEEDBACK_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}" />
+					</div>
 			
-			<!-- Options -->
-			<form id="optionForm" name="optionForm" class="form-group">
-				<%@ include file="optionlist.jsp"%>
-				
-				<a href="#nogo" onclick="javascript:addOption();" class="btn btn-xs btn-default button-add-item pull-right">
-					<fmt:message key="label.authoring.choice.add.option" /> 
-				</a>
-			</form>
+					<!-- Overall feedback -->
 			
-			<!-- Overall feedback -->
-			<br/>
-			<div class="overallFeedback">
-			  <a data-toggle="collapse" data-target="#overall-feedback" href="#overall-feedback"><i class="fa fa-xs fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.choice.overall.feedback" /></a>
-			
-				<div id="overall-feedback" class="collapse <c:if test="${(not empty assessmentQuestionForm.feedbackOnCorrect) || (not empty assessmentQuestionForm.feedbackOnPartiallyCorrect) || (not empty assessmentQuestionForm.feedbackOnIncorrect) }">in</c:if>">
 					<div class="form-group">
-						<label for="feedbackOnCorrectOutsideForm">
-							<fmt:message key="label.authoring.choice.feedback.on.correct" />
-						</label>
-						<lams:CKEditor id="feedbackOnCorrectOutsideForm" value="${assessmentQuestionForm.feedbackOnCorrect}" contentFolderID="${assessmentQuestionForm.contentFolderID}"/>
+						<c:set var="FEEDBACK_ON_CORRECT_LABEL"><fmt:message key="label.authoring.choice.feedback.on.correct"/></c:set>
+						<lams:CKEditor id="feedbackOnCorrect" value="${assessmentQuestionForm.feedbackOnCorrect}" 
+							placeholder="${FEEDBACK_ON_CORRECT_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}"/>
 					</div>
 					
 					<div class="form-group">
-						<label for="feedbackOnPartiallyCorrectOutsideForm">
-							<fmt:message key="label.authoring.choice.feedback.on.partially.correct" />
-						</label>
-						<lams:CKEditor id="feedbackOnPartiallyCorrectOutsideForm" value="${assessmentQuestionForm.feedbackOnPartiallyCorrect}" contentFolderID="${assessmentQuestionForm.contentFolderID}"/>
+						<c:set var="FEEDBACK_ON_PARTIALLY_CORRECT_LABEL"><fmt:message key="label.authoring.choice.feedback.on.partially.correct"/></c:set>
+						<lams:CKEditor id="feedbackOnPartiallyCorrect" value="${assessmentQuestionForm.feedbackOnPartiallyCorrect}" 
+							placeholder="${FEEDBACK_ON_PARTIALLY_CORRECT_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}"/>
 					</div>
 					
 					<div class="form-group">
-						<label for="feedbackOnIncorrectOutsideForm">
-							<fmt:message key="label.authoring.choice.feedback.on.incorrect" />
-						</label>
-						<lams:CKEditor id="feedbackOnIncorrectOutsideForm" value="${assessmentQuestionForm.feedbackOnIncorrect}" contentFolderID="${assessmentQuestionForm.contentFolderID}"/>
+						<c:set var="FEEDBACK_ON_INCORRECT_LABEL"><fmt:message key="label.authoring.choice.feedback.on.incorrect"/></c:set>
+						<lams:CKEditor id="feedbackOnIncorrect" value="${assessmentQuestionForm.feedbackOnIncorrect}" 
+							placeholder="${FEEDBACK_ON_INCORRECT_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}"/>
 					</div>
 				</div>
+			</form:form>
+			
+			<!-- Options -->
+			<div class="question-tab">
+				<form id="optionForm" name="optionForm" class="form-group">
+					<%@ include file="optionlist.jsp"%>
+					
+					<a href="#nogo" onclick="javascript:addOption();" class="btn btn-xs btn-default button-add-item pull-right">
+						<fmt:message key="label.authoring.choice.add.option" /> 
+					</a>
+				</form>
 			</div>
 
-			<div class="form-group voffset10 pull-right">
+		</div>		
+	</div>	
+	
+	<footer class="footer fixed-bottom">
+		<div class="panel-heading">
+        	<div class="pull-right">
 			    <a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
 					<fmt:message key="label.cancel" />
 				</a>
 				<a href="#nogo" onclick="javascript:$('#assessmentQuestionForm').submit();" class="btn btn-sm btn-default button-add-item">
 					<fmt:message key="label.authoring.save.button" />
 				</a>
-			</div>
-
-		</div>
-		<!--closes content-->
-	
-		<div id="footer">
-		</div>
-		<!--closes footer-->		
-	</div>	
+			</div>	
+      	</div>
+    </footer>
 </body>
 </lams:html>
Index: lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp
===================================================================
diff -u -r67d7232f087b9f5c72ff41f7bbebe29cff81e099 -r8a65083cf102509e0ca486f636746f56a600c514
--- lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision 67d7232f087b9f5c72ff41f7bbebe29cff81e099)
+++ lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision 8a65083cf102509e0ca486f636746f56a600c514)
@@ -4,23 +4,11 @@
 
 <lams:html>
 <lams:head>
-	<%@ include file="/common/header.jsp"%>
-	<link href="<lams:WebAppURL/>includes/css/addQuestion.css" rel="stylesheet" type="text/css">
-
-	<script type="text/javascript">
-		var questionType = ${questionType};
-		var addOptionUrl = "<c:url value='/authoring/addOption.do'/>";
-	   	var removeOptionUrl = "<c:url value='/authoring/removeOption.do'/>";
-   	    var upOptionUrl = "<c:url value='/authoring/upOption.do'/>";
-   	    var downOptionUrl = "<c:url value='/authoring/downOption.do'/>";
-	</script>
-	<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/assessmentoption.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
+	<%@ include file="/common/authoringQuestionHeader.jsp"%>
     <script>
 		$(document).ready(function(){
-				
 		    	$("#assessmentQuestionForm").validate({
+		    		ignore: 'hidden',
 		    		rules: {
 		    			title: "required",
 		    			defaultGrade: {
@@ -50,19 +38,7 @@
 		    			},
 		    			hasOptionFilled: "<fmt:message key='label.authoring.matching.pairs.error.one.matching.pair'/>"
 		    		},
-		    	    invalidHandler: function(form, validator) {
-		    		      var errors = validator.numberOfInvalids();
-		    		      if (errors) {
-		    		          var message = errors == 1
-		    		          	  ? "<fmt:message key='error.form.validation.error'/>"
-		    		          	  : "<fmt:message key='error.form.validation.errors'><fmt:param >" + errors + "</fmt:param></fmt:message>";
-	    		          	  
-		    		          $("div.error span").html(message);
-		    		          $("div.error").show();
-		    		      } else {
-		    		          $("div.error").hide();
-		    		      }
-		    		},
+		    	    invalidHandler: formInvalidHandler,
 		    		debug: true,
 		    		errorClass: "alert alert-danger",
      			    submitHandler: function(form) {
@@ -78,30 +54,16 @@
 		    			$('#assessmentQuestionForm').ajaxSubmit(options);
 		    		}
 		  		});
-		});
-   		// post-submit callback 
-   		function afterRatingSubmit(responseText, statusText)  { 
-   			self.parent.refreshThickbox()
-   			self.parent.tb_remove();
-   		}    
+		}); 
 	</script>
-		
 </lams:head>
-
 <body>
-	<div class="panel panel-default add-file">
+	<div class="panel-default add-file">
 		<div class="panel-heading panel-title">
 			<fmt:message key="label.authoring.basic.type.matching.pairs" />
 		</div>
 			
 		<div class="panel-body">
-		
-			<lams:errors/>
-		    <div class="error">
-		    	<lams:Alert id="errorMessages" type="danger" close="false" >
-					<span></span>
-				</lams:Alert>	
-		    </div>		
 			
 			<form:form action="saveOrUpdateQuestion.do" method="post" modelAttribute="assessmentQuestionForm" id="assessmentQuestionForm">
 				<c:set var="sessionMap" value="${sessionScope[assessmentQuestionForm.sessionMapID]}" />
@@ -115,92 +77,105 @@
 				<form:hidden path="feedbackOnPartiallyCorrect" />
 				<form:hidden path="feedbackOnIncorrect" />
 
-				<div class="form-group">
-				    <label for="title">
-				    	<fmt:message key="label.authoring.basic.question.name"/>
-				    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
-				    </label>
-				    <form:input path="title" id="title" maxlength="255" cssClass="form-control" tabindex="1"/>
-				</div>
-			
-				<div class="form-group">
-					<label for="question">
-						<fmt:message key="label.authoring.basic.question.text" />
-					</label>
-		            	
-					<lams:CKEditor id="question" value="${assessmentQuestionForm.question}" contentFolderID="${assessmentQuestionForm.contentFolderID}" />
-				</div>
+				<button type="button" id="question-settings-link" class="btn btn-default btn-sm">
+					<fmt:message key="label.settings" />
+				</button>
 				
-				<div class="checkbox">
-					<label for="answer-required">
-						<form:checkbox path="answerRequired" id="answer-required"/>
-						<fmt:message key="label.authoring.answer.required" />
-					</label>
-				</div>
-
-				<div class="form-group form-inline">
-					<c:if test="${!isAuthoringRestricted}">
-					    <label for="defaultGrade">
-					    	<fmt:message key="label.authoring.basic.default.question.grade" />:
-					    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
-					    </label>
-					    <form:input path="defaultGrade" cssClass="form-control short-input-text input-sm"/>
-				    </c:if>
-				    
-				    <label class="loffset10" for="penaltyFactor"> 
-				    	<fmt:message key="label.authoring.basic.penalty.factor" />:
-						  <i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
-				    </label>
-				    <form:input path="penaltyFactor" cssClass="form-control short-input-text input-sm"/>
-				</div>
+				<div class="question-tab">
+					<lams:errors/>
+					 <div class="error">
+				    	<lams:Alert id="errorMessages" type="danger" close="false" >
+							<span></span>
+						</lams:Alert>	
+				    </div>
+	
+					<div id="title-container" class="form-group">
+						<c:set var="TITLE_LABEL"><fmt:message key="label.enter.question.title"/> </c:set>
+					    <form:input path="title" id="title" cssClass="borderless-text-input" tabindex="1" maxlength="255" 
+					    	placeholder="${TITLE_LABEL}"/>
+					</div>
 				
-										
-				<div class="checkbox">
-					<label for="shuffle">
-						<form:checkbox path="shuffle" id="shuffle"/>
-						<fmt:message key="label.authoring.basic.shuffle.the.choices" />
-					</label>
+					<div class="form-group">
+						<c:set var="QUESTION_DESCRIPTION_LABEL"><fmt:message key="label.enter.question.description"/></c:set>
+						<lams:CKEditor id="question" value="${assessmentQuestionForm.question}" contentFolderID="${assessmentQuestionForm.contentFolderID}" 
+							placeholder="${QUESTION_DESCRIPTION_LABEL}"	 />
+					</div>
+					
+					<input type="text" name="hasOptionFilled" id="hasOptionFilled" class="fake-validation-input">
+					<label for="hasOptionFilled" class="error" style="display: none;"></label>
 				</div>
-
-				<div class="generalFeedback">
-				  <a data-toggle="collapse" data-target="#general-feedback" href="#general-fdback"><i class="fa fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.basic.general.feedback" /></a>
-					<div id="general-feedback"  class="collapse form-group">
-						<lams:CKEditor id="generalFeedback" value="${assessmentQuestionForm.generalFeedback}" contentFolderID="${assessmentQuestionForm.contentFolderID}" />
+				
+				<div class="settings-tab">
+					 <div class="error">
+				    	<lams:Alert id="errorMessages" type="danger" close="false" >
+							<span></span>
+						</lams:Alert>	
+				    </div>
+				
+					<div class="checkbox">
+						<label for="answer-required">
+							<form:checkbox path="answerRequired" id="answer-required"/>
+							<fmt:message key="label.authoring.answer.required" />
+						</label>
 					</div>
+	
+					<div class="form-group form-inline">
+						<c:if test="${!isAuthoringRestricted}">
+						    <label for="defaultGrade">
+						    	<fmt:message key="label.authoring.basic.default.question.grade" />:
+						    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
+						    </label>
+						    <form:input path="defaultGrade" cssClass="form-control short-input-text input-sm"/>
+					    </c:if>
+					    
+					    <label class="loffset10" for="penaltyFactor"> 
+					    	<fmt:message key="label.authoring.basic.penalty.factor" />:
+							  <i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
+					    </label>
+					    <form:input path="penaltyFactor" cssClass="form-control short-input-text input-sm"/>
+					</div>
+	
+					<div class="checkbox">
+						<label for="shuffle">
+							<form:checkbox path="shuffle" id="shuffle"/>
+							<fmt:message key="label.authoring.basic.shuffle.the.choices" />
+						</label>
+					</div>
+	
+					<div class="voffset5 form-group">
+						<c:set var="GENERAL_FEEDBACK_LABEL"><fmt:message key="label.authoring.basic.general.feedback"/></c:set>
+						<lams:CKEditor id="generalFeedback" value="${assessmentQuestionForm.generalFeedback}" 
+							placeholder="${GENERAL_FEEDBACK_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}" />
+					</div>
 				</div>
 				
-				<h5 class="voffset20">
-					<fmt:message key="label.authoring.matching.pairs.matching.pairs" />
-				</h5>
-				<input type="text" name="hasOptionFilled" id="hasOptionFilled" class="fake-validation-input">
-				<label for="hasOptionFilled" class="error" style="display: none;"></label>
 			</form:form>
 			
 			<!-- Options -->
-			<form id="optionForm" name="optionForm">
-				<%@ include file="optionlist.jsp"%>
-				
-				<a href="#nogo" onclick="javascript:addOption();" class="btn btn-xs btn-default button-add-item pull-right">
-					<fmt:message key="label.authoring.matching.pairs.add.matching.pair" /> 
-				</a>
-			</form>
+			<div class="question-tab">
+				<form id="optionForm" name="optionForm">
+					<%@ include file="optionlist.jsp"%>
+					
+					<a href="#nogo" onclick="javascript:addOption();" class="btn btn-xs btn-default button-add-item pull-right">
+						<fmt:message key="label.authoring.matching.pairs.add.matching.pair" /> 
+					</a>
+				</form>
+			</div>
 
-			<div class="voffset10 pull-right clear-both">
-			<a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
+		</div>		
+	</div>	
+	
+	<footer class="footer fixed-bottom">
+		<div class="panel-heading">
+        	<div class="pull-right">
+			    <a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
 					<fmt:message key="label.cancel" />
 				</a>
 				<a href="#nogo" onclick="javascript:$('#assessmentQuestionForm').submit();" class="btn btn-sm btn-default button-add-item">
-					<fmt:message key="label.authoring.matching.pairs.add.matching.pairs" />
+					<fmt:message key="label.authoring.save.button" />
 				</a>
-				
-			</div>
-
-		</div>
-		<!--closes content-->
-	
-		<div id="footer">
-		</div>
-		<!--closes footer-->		
-	</div>	
+			</div>	
+      	</div>
+    </footer>
 </body>
 </lams:html>
Index: lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp
===================================================================
diff -u -rc2dd5ccedb6cfa8bb4df16752c99c2c2d13478a0 -r8a65083cf102509e0ca486f636746f56a600c514
--- lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision c2dd5ccedb6cfa8bb4df16752c99c2c2d13478a0)
+++ lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision 8a65083cf102509e0ca486f636746f56a600c514)
@@ -4,242 +4,20 @@
 
 <lams:html>
 <lams:head>
-	<%@ include file="/common/header.jsp"%>
-	<link href="<lams:WebAppURL/>includes/css/addQuestion.css" rel="stylesheet" type="text/css">
-	<style>
-	:focus {
-	    outline: 0;
-	    /* or */
-	    outline: none;
-	}
-	label {
-    	font-weight: initial;
-	}
-	
-	#question-settings-link{
-		margin-top: -10px;
-    	margin-bottom: 5px;
-    	position: absolute;
-    	top: 60px;
-	    right: 20px;
-    	z-index: 2;
-    }
-	.delete-button, .arrows-div, .option-settings, #question-settings-link{
-		visibility:hidden;
-	}
-	.sortable-placeholder .option-text {
-		pointer-events: none
-	}
-	
-	
-	#option-table.hover-active tr:hover .delete-button, #option-table.hover-active tr:hover .arrows-div, #option-table.hover-active tr:hover .option-settings, #assessmentQuestionForm:hover #question-settings-link {
-		visibility:visible;
-	}
-	.basic-tab[style*="display: none"] + #question-settings-link {
-		visibility:visible;
-	}
-	#title {
-	    padding-right: 80px;
-	}
-	.advanced-tab {
-		display:none;
-	}
-	.delete-button {
-		opacity: 0.6;
-		cursor: pointer;
-	}
-
-
-	/*----------TEXT INPUT----------------*/
-	.form-control-new {
-	    display: block;
-	    width: 100%;
-	    height: 34px;
-	    font-size: 14px;
-	    line-height: 1.42857;
-	    color: rgb(85, 85, 85);
-	    background-color: rgb(255, 255, 255);
-	    background-image: none;
-	    /*box-shadow: rgba(0, 0, 0, 0.075) 0px 1px 1px inset;*/
-	    /*padding: 6px 12px;*/
-	    border-width: 0px;
-	    border-style: solid;
-	    border-color: rgb(204, 204, 204);
-	    border-image: initial;
-	    border-radius: 4px;
-	    transition: border-color 0.15s ease-in-out 0s, box-shadow 0.15s ease-in-out 0s;
-	    font-weight: bold;
-	}
-	.form-control-new::-webkit-input-placeholder {
-	    font-weight: normal;
-	}
-	.form-control-new::-moz-placeholder {
-	    font-weight: normal;
-	}
-	.form-control-new:-ms-input-placeholder {
-	    font-weight: normal;
-	}
-	.form-control-new:-o-input-placeholder {
-	    font-weight: normal;
-	}
-
-	/*----------CKEDITOR----------------*/
-	div[contenteditable] {
-	    display: block;
-	    width: 100%;
-	    padding: 0;
-	    font-size: 14px;
-	    line-height: 1.42857143;
-	    color: #555;
-	    background-color: #fff;
-	    background-image: none;
-	    border: 0;
-	    border-radius: 0;
-	    -webkit-box-shadow: inset 0 0 0 rgba(0,0,0,0.075);
-	    box-shadow: 0;
-	    -webkit-transition: border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;
-	    -o-transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
-	    transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
-	    overflow: hidden;
-	    min-height: 60px;
-	    -webkit-appearance: textfield;
-	}
-	
-/*----------UL numbers----------------*/
-#option-table table {
-	width: 100%;
-}
-#option-table td:first-child {
-	width: 60px;
-	vertical-align: top;
-}
-#option-table td:first-child span{
-	display: inline-block;
-	width: 4rem;
-	height: 4rem;
-	text-align: center;
-	line-height: 2em;
-	font-size: 1.8rem;
-	color: #fff;
-	border: .2rem solid #313537;
-	-webkit-border-radius: 50%;
-	border-radius: 50%;
-	border-color: #337ab7 !important;
-	background-color: #337ab7 !important;
-}
-
-/*----------SLIDER----------------*/
-
-.ui-widget-content {
-	border: 1px solid #bdc3c7;
-	background: #e1e1e1;
-	color: #222222;
-	margin-top: 0.1em;
-	padding: 1px;
-}
-
-.ui-state-default, .ui-widget-content .ui-state-default{
-	background:transparent !important;
-	border:none !important;
-}
-.ui-slider .ui-slider-handle label{
-    background: #c3c3c3;
-    border-radius: 20px;
-    width:5.2em;
-}
-
-.ui-slider .ui-slider-handle {
-	position: absolute;
-	z-index: 2;
-	width: 5.2em;
-	height: 100px;
-	cursor: default;
-	margin: 0 -40px auto !important;
-	text-align: center;	
-	line-height: 32px;
-	color: #FFFFFF;
-}
-
-.ui-slider .ui-slider-handle .fa {
-	color: #FFFFFF;
-    margin: 0 3px;
-    font-size: 18px;
-    opacity: 0.5;
-    font-weight: bolder;
-}
-
-.ui-slider-horizontal .ui-slider-handle {
-	top: -.9em;
-}
-
-.ui-state-default, .ui-widget-content .ui-state-default {
-	border: 1px solid #f9f9f9;
-	background: #3498db;
-}
-
-.ui-slider-horizontal .ui-slider-handle {
-	margin-left: -0.5em;
-}
-
-.ui-slider .ui-slider-handle {
-	cursor: pointer;
-}
-
-.ui-slider a, .ui-slider a:focus {
-	cursor: pointer;
-	outline: none;
-}
-
-.price-slider {
-    height: 30px;
-    padding-top: 15px;
-}
-/*
-.sortable-placeholder {
-	height: 130px; 
-	background-color: #f1f1f1;
-	margin: 0px 0 20px -0;
-}*/
-.ui-sortable-helper {
-	opacity: 0.8;
-}
-	.sortable-chosen {
-		background-color: #fff;
-	}
-
-
-
-
-	.sortable-placeholder {
-		background-color: rgba(241, 241, 241, 0.7);
-	}
-	</style>
-
-	<script type="text/javascript">
-		var questionType = ${questionType};
-		var addOptionUrl = "<c:url value='/authoring/addOption.do'/>";
-	</script>
-	<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/assessmentoption.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.touch-punch.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/Sortable.js"></script>
+	<%@ include file="/common/authoringQuestionHeader.jsp"%>
     <script>
 		$(document).ready(function(){
-				
-		    	$("#assessmentQuestionForm").validate({
-		    		onkeyup: false,
-		    		onclick: false,
+		    $("#assessmentQuestionForm").validate({
+		    		ignore: 'hidden',
 		    		rules: {
 		    			title: "required",
 		    			defaultGrade: {
-		    			      required: true,
-		    			      digits: true
+		    			    required: true,
+		    			    digits: true
 		    			},
 		    			penaltyFactor: {
-		    			      required: true,
-		    			      number: true
+		    			    required: true,
+		    			    number: true
 		    			},
 		    			hasOptionFilled: {
 		    				required: function(element) {
@@ -274,19 +52,7 @@
 		    				required: "<fmt:message key='error.form.validation.hundred.score'/>"
 		    			}
 		    		},
-		    	    invalidHandler: function(form, validator) {
-		    		      var errors = validator.numberOfInvalids();
-		    		      if (errors) {
-		    		          var message = errors == 1
-		    		          	  ? "<fmt:message key='error.form.validation.error'/>"
-		    		          	  : "<fmt:message key='error.form.validation.errors'><fmt:param >" + errors + "</fmt:param></fmt:message>";
-	    		          	  
-		    		          $("div.error span").html(message);
-		    		          $("div.error").show();
-		    		      } else {
-		    		          $("div.error").hide();
-		    		      }
-		    		},
+		    	    invalidHandler: formInvalidHandler,
 		    		debug: true,
 		    		errorClass: "alert alert-danger",
      			    submitHandler: function(form) {
@@ -305,169 +71,49 @@
 		    		    				
 		    			$('#assessmentQuestionForm').ajaxSubmit(options);
 		    		}
-		  		});
+		  	});
 		    	
-				$("#multipleAnswersAllowed").on('change', function() {
-					$("#incorrect-answer-nullifies-mark-area").toggle(eval($(this).val()));
-				}).trigger("change");
+			$("#multipleAnswersAllowed").on('change', function() {
+				$("#incorrect-answer-nullifies-mark-area").toggle(eval($(this).val()));
+			}).trigger("change");
 
-				// Only one of prefixAnswersWithLetters or shuffle at a time
- 				$("#prefixAnswersWithLetters").on('change', function() {
-					if ( this.checked ) {
-						if ($("#shuffle").prop('checked')) {
-							$("#shuffle").prop('checked', false);
-						}
-						$("#shuffle").prop('disabled', true);
-						$("#shuffleText").addClass('text-muted');
-					} else {
-						$("#shuffle").prop('disabled', false);
-						$("#shuffleText").removeClass('text-muted');
+			// Only one of prefixAnswersWithLetters or shuffle at a time
+ 			$("#prefixAnswersWithLetters").on('change', function() {
+				if ( this.checked ) {
+					if ($("#shuffle").prop('checked')) {
+						$("#shuffle").prop('checked', false);
 					}
-				}).trigger("change");
-
-				$("#shuffle").on('change', function() {
-					if ( this.checked ) {
-						if ($("#prefixAnswersWithLetters").prop('checked')) {
-							$("#prefixAnswersWithLetters").prop('checked', false);
-						}
-						$("#prefixAnswersWithLetters").prop('disabled', true);
-						$("#prefixAnswersWithLettersText").addClass('text-muted');
-					} else {
-						$("#prefixAnswersWithLetters").prop('disabled', false);
-						$("#prefixAnswersWithLettersText").removeClass('text-muted');
-					}
-				}).trigger("change"); 
-				
-				$("#question-settings-link").on('click', function() {
-					$(".basic-tab, .advanced-tab").fadeToggle("fast", function() {});
-					
-					$(this).toggleClass("btn-default btn-primary");
-				});
-				
-			initializeOptionItems();
-			
-		});
-   		// post-submit callback 
-   		function afterRatingSubmit(responseText, statusText)  { 
-   			self.parent.refreshThickbox()
-   			self.parent.tb_remove();
-   		}
-
-   		function initializeOptionItems() {
-			//Grading slider
-	        $(".slider").slider({
-	            animate: true,
-	            min: -1,
-	            max: 1,
-	            step: 0.05,
-	            create: function(event, ui){
-		            //get initial value from the responsible form input
-	            	var initialValue = $(this).next("input").val();
-	            	$(this).slider('value', initialValue);
-	                //$(this).slider('value',$(this).parent().find(".inputNumber").val());
-	            }
-	        }).on('slide',function(event,ui){
-		        //ui is not available at the initial call 
-		        var newValueInt = ui ? eval(ui.value) : eval($(this).slider('value'));
-		        
-		        //prepare string value
-		        var newValue;
-		        switch (newValueInt) {
-				  case 0:
-					newValue = " <fmt:message key="label.authoring.basic.none" /> ";
-				    break;
-				  case 1:
-				  case -1:
-					newValue = parseInt(newValueInt*100) + " %";
-					break;
-				  default:
-					newValue = " " + parseInt(newValueInt*100) + " % ";
+					$("#shuffle").prop('disabled', true);
+					$("#shuffleText").addClass('text-muted');
+				} else {
+					$("#shuffle").prop('disabled', false);
+					$("#shuffleText").removeClass('text-muted');
 				}
-		        
-				//update slider's label
-	        	$('span', $(this)).html('<label><span class="fa fa-angle-left"></span><span>'+newValue+'</span><span class="fa fa-angle-right"></span></label>');
+			}).trigger("change");
 
-	        	//update input with the new value, it it's not initial call
-	        	if (ui) {
-		        	$(this).next("input").val(ui.value);
-	        	}
-	        });
-	        //update slider's label with the initial value
-	        //$('.slider').trigger('slide');
-	        //$('#slider').slider('value', $('#slider').slider('value'));
-
-	        new Sortable(document.getElementById('option-table'), {
-			    animation: 150,
-			    ghostClass: 'sortable-placeholder',
-			    direction: 'vertical',
-			    
-				// Element dragging started
-				onStart: function (/**Event*/evt) {
-					//stop answers' hover effect
-					$("#option-table").removeClass("hover-active");
-				},
-
-				// Element dragging ended
-				onEnd: function (/**Event*/evt) {
-					//activate answers' hover effect
-					//$("#option-table").addClass("");
-					$("#option-table").delay(50).queue(function(next){
-					    $(this).addClass("hover-active", 1000);
-					    next();
-					});
-				},
-				store: {
-
-					/**
-					 * Save the order of elements. Called onEnd (when the item is dropped).
-					 * @param {Sortable}  sortable
-					 */
-					set: function (sortable) {
-						//update all sequenceIds
-						var order = sortable.toArray();
-						for (var i = 0; i < order.length; i++) {
-						    var optionIndex = order[i];
-						    $('input[name="optionSequenceId' + optionIndex + '"]').val(i+1);
-						}
-						//localStorage.setItem(sortable.options.group.name, order.join('|'));
+			$("#shuffle").on('change', function() {
+				if ( this.checked ) {
+					if ($("#prefixAnswersWithLetters").prop('checked')) {
+						$("#prefixAnswersWithLetters").prop('checked', false);
 					}
+					$("#prefixAnswersWithLetters").prop('disabled', true);
+					$("#prefixAnswersWithLettersText").addClass('text-muted');
+				} else {
+					$("#prefixAnswersWithLetters").prop('disabled', false);
+					$("#prefixAnswersWithLettersText").removeClass('text-muted');
 				}
-			});
-			
-	        /*		$( "#option-table" ).sortable({
-				tolerance: "pointer",
-				placeholder: "sortable-placeholder",
-				forcePlaceholderSize: true,
-				forceHelperSize: true,
-				helper: "clone",
-				cancel: ':input,button,[contenteditable]',
-				start: function( event, ui ) {
-					//stop answers' hover effect
-					$("#option-table").removeClass("hover-active");
-				},
-				stop: function( event, ui ) {
-					//activate answers' hover effect
-					$("#option-table").addClass("hover-active");
-				}
-			});*/
-		}
+			}).trigger("change");
+		});
 	</script>
 </lams:head>
 <body>
-	<div class="panel panel-default add-file">
+	<div class="panel-default add-file">
 		<div class="panel-heading panel-title">
 			<fmt:message key="label.authoring.basic.type.multiple.choice" />
 		</div>
 			
 		<div class="panel-body">
 			
-			<lams:errors/>
-		    <div class="error">
-		    	<lams:Alert id="errorMessages" type="danger" close="false" >
-					<span></span>
-				</lams:Alert>	
-		    </div>
-			
 			<form:form action="saveOrUpdateQuestion.do" method="post" modelAttribute="assessmentQuestionForm" id="assessmentQuestionForm">
 				<c:set var="sessionMap" value="${sessionScope[assessmentQuestionForm.sessionMapID]}" />
 				<c:set var="isAuthoringRestricted" value="${sessionMap.isAuthoringRestricted}" />
@@ -476,145 +122,156 @@
 				<input type="hidden" name="optionList" id="optionList" />
 				<form:hidden path="sequenceId" />
 				<form:hidden path="contentFolderID" id="contentFolderID"/>
-
-				<div class="basic-tab">
-					<div class="form-group">
-					    <form:input path="title" id="title" cssClass="form-control-new" maxlength="255" tabindex="1" placeholder="Enter a question's title"/>
-					</div>
 				
-					<div class="form-group">
-						<lams:CKEditor id="question" classes="ckeditor-without-borders22" 
-						placeholder="Question's description"
-						value="${assessmentQuestionForm.question}" contentFolderID="${assessmentQuestionForm.contentFolderID}" />
-					</div>
-				</div>
-				
 				<button type="button" id="question-settings-link" class="btn btn-default btn-sm">
-					Settings
+					<fmt:message key="label.settings" />
 				</button>
 
-				<div class="advanced-tab">
-				<div class="checkbox">
-					<label for="answer-required">
-						<form:checkbox path="answerRequired" id="answer-required"/>
-						<fmt:message key="label.authoring.answer.required" />
-					</label>
-				</div>
+				<div class="question-tab">
+					<lams:errors/>
+					 <div class="error">
+				    	<lams:Alert id="errorMessages" type="danger" close="false" >
+							<span></span>
+						</lams:Alert>	
+				    </div>
 				
-				<div class="form-group form-inline">
-					<c:if test="${!isAuthoringRestricted}">
-					    <label for="defaultGrade">
-					    	<fmt:message key="label.authoring.basic.default.question.grade" />:
-					    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
-					    </label>
-					    <form:input path="defaultGrade" cssClass="form-control short-input-text input-sm"/>
-				    </c:if>
-				</div>
+					<div id="title-container" class="form-group">
+						<c:set var="TITLE_LABEL"><fmt:message key="label.enter.question.title"/> </c:set>
+					    <form:input path="title" id="title" cssClass="borderless-text-input" tabindex="1" maxlength="255"  
+					    	placeholder="${TITLE_LABEL}"/>
+					</div>
 				
-				<div class="form-group form-inline">
-				    <label for="penaltyFactor"> 
-				    	<fmt:message key="label.authoring.basic.penalty.factor" />:
-						  <i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
-				    </label>
-				    <form:input path="penaltyFactor" cssClass="form-control short-input-text input-sm"/>
-				</div>
+					<div class="form-group">
+						<c:set var="QUESTION_DESCRIPTION_LABEL"><fmt:message key="label.enter.question.description"/></c:set>
+						<lams:CKEditor id="question" value="${assessmentQuestionForm.question}" contentFolderID="${assessmentQuestionForm.contentFolderID}" 
+							placeholder="${QUESTION_DESCRIPTION_LABEL}"	 />
+					</div>
 				
-				<div class="form-inline form-group">
-					<label for="multipleAnswersAllowed">
-						<fmt:message key="label.authoring.choice.one.multiple.answers" />
-					</label>
-					<form:select path="multipleAnswersAllowed" id="multipleAnswersAllowed" cssClass="form-control input-sm">
-						<form:option value="false"><fmt:message key="label.authoring.choice.one.answer" /></form:option>
-						<form:option value="true"><fmt:message key="label.authoring.choice.multiple.answers" /></form:option>
-					</form:select>
+					<input type="text" name="hasOptionFilled" id="hasOptionFilled" class="fake-validation-input">
+					<input type="text" name="hasOneHundredGrade" id="hasOneHundredGrade" class="fake-validation-input">
 				</div>
+
+				<div class="settings-tab">
+					 <div class="error">
+				    	<lams:Alert id="errorMessages" type="danger" close="false" >
+							<span></span>
+						</lams:Alert>	
+				    </div>
 				
-				<div class="checkbox" id="incorrect-answer-nullifies-mark-area">
-					<label for="incorrectAnswerNullifiesMark">
-						<form:checkbox path="incorrectAnswerNullifiesMark" id="incorrectAnswerNullifiesMark"/>
-						<fmt:message key="label.incorrect.answer.nullifies.mark" />
-					</label>
-				</div>		
+					<div class="checkbox">
+						<label for="answer-required">
+							<form:checkbox path="answerRequired" id="answer-required"/>
+							<fmt:message key="label.authoring.answer.required" />
+						</label>
+					</div>
+					
+					<div class="form-group form-inline">
+						<c:if test="${!isAuthoringRestricted}">
+						    <label for="defaultGrade">
+						    	<fmt:message key="label.authoring.basic.default.question.grade" />:
+						    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
+						    </label>
+						    <form:input path="defaultGrade" cssClass="form-control short-input-text input-sm"/>
+					    </c:if>
+					</div>
+					
+					<div class="form-group form-inline">
+					    <label for="penaltyFactor"> 
+					    	<fmt:message key="label.authoring.basic.penalty.factor" />:
+							  <i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
+					    </label>
+					    <form:input path="penaltyFactor" cssClass="form-control short-input-text input-sm"/>
+					</div>
+					
+					<div class="form-inline form-group">
+						<label for="multipleAnswersAllowed">
+							<fmt:message key="label.authoring.choice.one.multiple.answers" />
+						</label>
+						<form:select path="multipleAnswersAllowed" id="multipleAnswersAllowed" cssClass="form-control input-sm">
+							<form:option value="false"><fmt:message key="label.authoring.choice.one.answer" /></form:option>
+							<form:option value="true"><fmt:message key="label.authoring.choice.multiple.answers" /></form:option>
+						</form:select>
+					</div>
+					
+					<div class="checkbox" id="incorrect-answer-nullifies-mark-area">
+						<label for="incorrectAnswerNullifiesMark">
+							<form:checkbox path="incorrectAnswerNullifiesMark" id="incorrectAnswerNullifiesMark"/>
+							<fmt:message key="label.incorrect.answer.nullifies.mark" />
+						</label>
+					</div>		
+		
+					<div class="checkbox">
+						<label for="shuffle">
+							<form:checkbox path="shuffle" id="shuffle"/>
+							<span id="shuffleText"><fmt:message key="label.authoring.basic.shuffle.the.choices" /></span>
+						</label>
+					</div>
+					
+					<div class="checkbox" id="prefixAnswersWithLettersDiv">
+						<label for="prefixAnswersWithLetters">
+							<form:checkbox path="prefixAnswersWithLetters" id="prefixAnswersWithLetters"/>
+							<span id="prefixAnswersWithLettersText"><fmt:message key="label.prefix.sequential.letters.for.each.answer" /></span>
+						</label>
+					</div>
 	
-				<div class="checkbox">
-					<label for="shuffle">
-						<form:checkbox path="shuffle" id="shuffle"/>
-						<span id="shuffleText"><fmt:message key="label.authoring.basic.shuffle.the.choices" /></span>
-					</label>
-				</div>
-				
-				<div class="checkbox" id="prefixAnswersWithLettersDiv">
-					<label for="prefixAnswersWithLetters">
-						<form:checkbox path="prefixAnswersWithLetters" id="prefixAnswersWithLetters"/>
-						<span id="prefixAnswersWithLettersText"><fmt:message key="label.prefix.sequential.letters.for.each.answer" /></span>
-					</label>
-				</div>
-
-				<div class="generalFeedback">
-					<div id="general-feedback"  class="voffset5 form-group">
+					<div class="voffset5 form-group">
 						<c:set var="GENERAL_FEEDBACK_LABEL"><fmt:message key="label.authoring.basic.general.feedback"/></c:set>
 						<lams:CKEditor id="generalFeedback" value="${assessmentQuestionForm.generalFeedback}" 
 							placeholder="${GENERAL_FEEDBACK_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}" />
 					</div>
-				</div>
-			
-				<!-- Overall feedback -->
-				<div class="overallFeedback">
-				  <fmt:message key="label.authoring.choice.overall.feedback" />
-	
-					<div id="overall-feedback">				
-						<div class="form-group">
-							<c:set var="FEEDBACK_ON_CORRECT_LABEL"><fmt:message key="label.authoring.choice.feedback.on.correct"/></c:set>
-							<lams:CKEditor id="feedbackOnCorrect" value="${assessmentQuestionForm.feedbackOnCorrect}" 
-								placeholder="${FEEDBACK_ON_CORRECT_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}"/>
+				
+					<!-- Overall feedback -->
+					<div class="overallFeedback">
+					  <fmt:message key="label.authoring.choice.overall.feedback" />
+		
+						<div id="overall-feedback">				
+							<div class="form-group">
+								<c:set var="FEEDBACK_ON_CORRECT_LABEL"><fmt:message key="label.authoring.choice.feedback.on.correct"/></c:set>
+								<lams:CKEditor id="feedbackOnCorrect" value="${assessmentQuestionForm.feedbackOnCorrect}" 
+									placeholder="${FEEDBACK_ON_CORRECT_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}"/>
+							</div>
+							
+							<div class="form-group">
+								<c:set var="FEEDBACK_ON_PARTICALLY_CORRECT_LABEL"><fmt:message key="label.authoring.choice.feedback.on.partially.correct" /></c:set>
+								<lams:CKEditor id="feedbackOnPartiallyCorrect" value="${assessmentQuestionForm.feedbackOnPartiallyCorrect}" 
+									placeholder="${FEEDBACK_ON_PARTICALLY_CORRECT_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}"/>
+							</div>
+							
+							<div class="form-group">
+								<c:set var="FEEDBACK_ON_INCORRECT_LABEL"><fmt:message key="label.authoring.choice.feedback.on.incorrect" /></c:set>
+								<lams:CKEditor id="feedbackOnIncorrect" value="${assessmentQuestionForm.feedbackOnIncorrect}" 
+									placeholder="${FEEDBACK_ON_INCORRECT_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}"/>
+							</div>
 						</div>
-						
-						<div class="form-group">
-							<c:set var="FEEDBACK_ON_PARTICALLY_CORRECT_LABEL"><fmt:message key="label.authoring.choice.feedback.on.partially.correct" /></c:set>
-							<lams:CKEditor id="feedbackOnPartiallyCorrect" value="${assessmentQuestionForm.feedbackOnPartiallyCorrect}" 
-								placeholder="${FEEDBACK_ON_PARTICALLY_CORRECT_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}"/>
-						</div>
-						
-						<div class="form-group">
-							<c:set var="FEEDBACK_ON_INCORRECT_LABEL"><fmt:message key="label.authoring.choice.feedback.on.incorrect" /></c:set>
-							<lams:CKEditor id="feedbackOnIncorrect" value="${assessmentQuestionForm.feedbackOnIncorrect}" 
-								placeholder="${FEEDBACK_ON_INCORRECT_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}"/>
-						</div>
 					</div>
-				</div>
-				</div><!-- advanced tab ends -->
-				
-				<input type="text" name="hasOptionFilled" id="hasOptionFilled" class="fake-validation-input">
-				<input type="text" name="hasOneHundredGrade" id="hasOneHundredGrade" class="fake-validation-input">
+				</div><!-- settings tab ends -->
 			</form:form>
 			
 			<!-- Options -->
-			<div class="basic-tab">	
+			<div class="question-tab">	
 				<form id="optionForm" name="optionForm" class="form-group">
 					<%@ include file="optionlist.jsp"%>
 					
 					<a href="#nogo" onclick="javascript:addOption();" class="btn btn-xs btn-default button-add-item pull-right">
 						<fmt:message key="label.authoring.choice.add.option" /> 
 					</a>
 				</form>
-			</div>
+			</div>		
 
-			<br/>
-			<div class="voffset10 pull-right">
+		</div>	
+	</div>	
+	
+	<footer class="footer fixed-bottom">
+		<div class="panel-heading">
+        	<div class="pull-right">
 			    <a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
 					<fmt:message key="label.cancel" />
 				</a>
 				<a href="#nogo" onclick="javascript:$('#assessmentQuestionForm').submit();" class="btn btn-sm btn-default button-add-item">
 					<fmt:message key="label.authoring.save.button" />
 				</a>
-			</div>			
-
-		</div>
-		<!--closes content-->
-	
-		<div id="footer">
-		</div>
-		<!--closes footer-->		
-	</div>		
+			</div>	
+      	</div>
+    </footer>	
 </body>
 </lams:html>
Index: lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp
===================================================================
diff -u -r67d7232f087b9f5c72ff41f7bbebe29cff81e099 -r8a65083cf102509e0ca486f636746f56a600c514
--- lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp	(.../addnumerical.jsp)	(revision 67d7232f087b9f5c72ff41f7bbebe29cff81e099)
+++ lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp	(.../addnumerical.jsp)	(revision 8a65083cf102509e0ca486f636746f56a600c514)
@@ -4,41 +4,11 @@
 		
 <lams:html>
 	<lams:head>
-		<%@ include file="/common/header.jsp"%>
-		<link href="<lams:WebAppURL/>includes/css/addQuestion.css" rel="stylesheet" type="text/css">
-
-		<script type="text/javascript">
-			var questionType = ${questionType};
-			var addOptionUrl = "<c:url value='/authoring/addOption.do'/>";
-		   	var removeOptionUrl = "<c:url value='/authoring/removeOption.do'/>";
-    	    var upOptionUrl = "<c:url value='/authoring/upOption.do'/>";
-    	    var downOptionUrl = "<c:url value='/authoring/downOption.do'/>";
-    	    
-    		function addUnit(){
-    			var url= "<c:url value='/authoring/newUnit.do'/>";
-    			var unitList = $("#unitForm").serialize(true);
-    			$("#unitArea").load(
-    				url,
-    				{
-    					questionType: questionType,
-    					unitList: unitList 
-    				}
-    			);
-    		}
-		</script>
-		<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/assessmentoption.js"></script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
+		<%@ include file="/common/authoringQuestionHeader.jsp"%>
   	    <script>
 			$(document).ready(function(){
-				var optionValidator = $("#optionForm").validate({
-					errorClass: "alert-danger"
-				});				
-				var unitValidator = $("#unitForm").validate({
-					errorClass: "alert-danger"
-				});
-				
 		    	$("#assessmentQuestionForm").validate({
+		    		ignore: 'hidden',
 		    		rules: {
 		    			title: "required",
 		    			defaultGrade: {
@@ -60,8 +30,8 @@
 	    			    hasOneHundredGrade: {
 		    				required: function(element) {
 		    					var hasOneHundredGrade = false;
-		    					$("select[name^='optionGrade']").each(function() {
-		    						hasOneHundredGrade = hasOneHundredGrade || (this.value == '1.0');
+		    					$("input[name^='optionGrade']").each(function() {
+		    						hasOneHundredGrade = hasOneHundredGrade || (eval(this.value) == 1);
 		    					});
 	    			    		return !hasOneHundredGrade;
 			    		    }			    		    
@@ -114,26 +84,7 @@
 		    				required: ""
 		    			}
 		    		},
-		    	    invalidHandler: function(form, validator) {
-		    		      var errors = validator.numberOfInvalids();
-		    		      if (errors) {
-			    		      if (optionValidator.numberOfInvalids()) {
-			    		    	  errors += optionValidator.numberOfInvalids() - 1;
-			    		      }
-			    		      if (unitValidator.numberOfInvalids()) {
-			    		    	  errors += unitValidator.numberOfInvalids() - 1;
-			    		      }
-			    		      
-		    		          var message = errors == 1
-		    		          	  ? "<fmt:message key='error.form.validation.error'/>"
-		    		          	  : "<fmt:message key='error.form.validation.errors'><fmt:param >" + errors + "</fmt:param></fmt:message>";
-	    		          	  
-		    		          $("div.error span").html(message);
-		    		          $("div.error").show();
-		    		      } else {
-		    		          $("div.error").hide();
-		    		      }
-		    		},
+		    	    invalidHandler: formInvalidHandler,
 		    		debug: true,
 		    		errorClass: "alert alert-danger",
      			    submitHandler: function(form) {
@@ -151,30 +102,28 @@
 		    			$('#assessmentQuestionForm').ajaxSubmit(options);
 		    		}
 		  		});
-			});
-    		// post-submit callback 
-    		function afterRatingSubmit(responseText, statusText)  { 
-    			self.parent.refreshThickbox()
-    			self.parent.tb_remove();
-    		}    
+			}); 
+
+    		function addUnit(){
+    			var url= "<c:url value='/authoring/newUnit.do'/>";
+    			var unitList = $("#unitForm").serialize(true);
+    			$("#unitArea").load(
+    				url,
+    				{
+    					questionType: questionType,
+    					unitList: unitList 
+    				}
+    			);
+    		}
   		</script>
-		
 	</lams:head>
-	
 <body>
-	<div class="panel panel-default add-file">
+	<div class="panel-default add-file">
 		<div class="panel-heading panel-title">
 			<fmt:message key="label.authoring.numerical.question" />
 		</div>
 			
 		<div class="panel-body">
-		
-			<lams:errors/>
-		    <div class="error">
-		    	<lams:Alert id="errorMessages" type="danger" close="false" >
-					<span></span>
-				</lams:Alert>	
-		    </div>
 			
 			<form:form action="saveOrUpdateQuestion.do" method="post" modelAttribute="assessmentQuestionForm" id="assessmentQuestionForm">
 				<c:set var="sessionMap" value="${sessionScope[assessmentQuestionForm.sessionMapID]}" />
@@ -186,97 +135,113 @@
 				<form:hidden path="sequenceId" />
 				<form:hidden path="contentFolderID" id="contentFolderID"/>
 
-				<div class="form-group">
-				    <label for="title">
-				    	<fmt:message key="label.authoring.basic.question.name"/>
-				    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
-				    </label>
-				    <form:input path="title" maxlength="255" id="title" cssClass="form-control" tabindex="1"/>
-				</div>
-			
-				<div class="form-group">
-					<label for="question">
-						<fmt:message key="label.authoring.basic.question.text" />
-					</label>
-		            	
-					<lams:CKEditor id="question" value="${assessmentQuestionForm.question}" contentFolderID="${assessmentQuestionForm.contentFolderID}" />
-				</div>
+				<button type="button" id="question-settings-link" class="btn btn-default btn-sm">
+					<fmt:message key="label.settings" />
+				</button>
 				
-				<div class="checkbox">
-					<label for="answer-required">
-						<form:checkbox path="answerRequired" id="answer-required"/>
-						<fmt:message key="label.authoring.answer.required" />
-					</label>
-				</div>
+				<div class="question-tab">
+					<lams:errors/>
+					 <div class="error">
+				    	<lams:Alert id="errorMessages" type="danger" close="false" >
+							<span></span>
+						</lams:Alert>	
+				    </div>
+	
+					<div id="title-container" class="form-group">
+						<c:set var="TITLE_LABEL"><fmt:message key="label.enter.question.title"/> </c:set>
+					    <form:input path="title" id="title" cssClass="borderless-text-input" tabindex="1" maxlength="255"
+					    	placeholder="${TITLE_LABEL}"/>
+					</div>
 				
-				<div class="form-group form-inline">
-					<c:if test="${!isAuthoringRestricted}">
-					    <label for="defaultGrade">
-					    	<fmt:message key="label.authoring.basic.default.question.grade" />:
-					    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
-					    </label>
-					    <form:input path="defaultGrade" cssClass="number form-control short-input-text input-sm"/>
-				    </c:if>
-
-				    <label class="loffset10" for="penaltyFactor"> 
-				    	<fmt:message key="label.authoring.basic.penalty.factor" />: 
-						  <i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
-				    </label>
-				    <form:input path="penaltyFactor" cssClass="form-control short-input-text input-sm"/>
+					<div class="form-group">
+						<c:set var="QUESTION_DESCRIPTION_LABEL"><fmt:message key="label.enter.question.description"/></c:set>
+						<lams:CKEditor id="question" value="${assessmentQuestionForm.question}" contentFolderID="${assessmentQuestionForm.contentFolderID}" 
+							placeholder="${QUESTION_DESCRIPTION_LABEL}"	 />
+					</div>
+					
+					<input type="text" name="hasOptionFilled" id="hasOptionFilled" class="fake-validation-input">
+					<input type="text" name="hasOneHundredGrade" id="hasOneHundredGrade" class="fake-validation-input">
+					<input type="text" name="allAcceptedErrorsPositive" id="allAcceptedErrorsPositive" class="fake-validation-input">
 				</div>
 				
-  			<div class="generalFeedback">
-				  <a data-toggle="collapse" data-target="#general-feedback" href="#general-fdback"><i class="fa fa-xs fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.basic.general.feedback" /></a>
-					<div id="general-feedback"  class="voffset5 collapse <c:if test="${not empty assessmentQuestionForm.generalFeedback}">in</c:if> form-group">
-						<lams:CKEditor id="generalFeedback" value="${assessmentQuestionForm.generalFeedback}" contentFolderID="${assessmentQuestionForm.contentFolderID}" />
+				<div class="settings-tab">
+					 <div class="error">
+				    	<lams:Alert id="errorMessages" type="danger" close="false" >
+							<span></span>
+						</lams:Alert>	
+				    </div>
+				    
+					<div class="checkbox">
+						<label for="answer-required">
+							<form:checkbox path="answerRequired" id="answer-required"/>
+							<fmt:message key="label.authoring.answer.required" />
+						</label>
 					</div>
-				</div>				
+					
+					<div class="form-group form-inline">
+						<c:if test="${!isAuthoringRestricted}">
+						    <label for="defaultGrade">
+						    	<fmt:message key="label.authoring.basic.default.question.grade" />:
+						    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
+						    </label>
+						    <form:input path="defaultGrade" cssClass="number form-control short-input-text input-sm"/>
+					    </c:if>
+	
+					    <label class="loffset10" for="penaltyFactor"> 
+					    	<fmt:message key="label.authoring.basic.penalty.factor" />: 
+							  <i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
+					    </label>
+					    <form:input path="penaltyFactor" cssClass="form-control short-input-text input-sm"/>
+					</div>
+					
+					<div class="voffset5 form-group">
+						<c:set var="GENERAL_FEEDBACK_LABEL"><fmt:message key="label.authoring.basic.general.feedback"/></c:set>
+						<lams:CKEditor id="generalFeedback" value="${assessmentQuestionForm.generalFeedback}" 
+							placeholder="${GENERAL_FEEDBACK_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}" />
+					</div>
+				</div>			
 				
-				<h5 class="voffset20">
-					<fmt:message key="label.authoring.numerical.answers" />
-				</h5>
-				<input type="text" name="hasOptionFilled" id="hasOptionFilled" class="fake-validation-input">
-				<input type="text" name="hasOneHundredGrade" id="hasOneHundredGrade" class="fake-validation-input">
-				<input type="text" name="allAcceptedErrorsPositive" id="allAcceptedErrorsPositive" class="fake-validation-input">
 			</form:form>
 			
 			<!-- Options -->
-			<form id="optionForm" name="optionForm">
-				<%@ include file="optionlist.jsp"%>
-				
-				<a href="#nogo" onclick="javascript:addOption();" class="btn btn-xs btn-default button-add-item pull-right">
-					<fmt:message key="label.authoring.numerical.add.answer" />  
-				</a>
-			</form>
+			<div class="question-tab">
+				<form id="optionForm" name="optionForm">
+					<%@ include file="optionlist.jsp"%>
+					
+					<a href="#nogo" onclick="javascript:addOption();" class="btn btn-xs btn-default button-add-item pull-right">
+						<fmt:message key="label.authoring.numerical.add.answer" />  
+					</a>
+				</form>
+			</div>
 			
 			<!-- Units -->
-			<h5 class="voffset20">
-				<fmt:message key="label.authoring.numerical.units" />
-			</h5>			
-			<form id="unitForm" name="unitForm">
-				<%@ include file="unitlist.jsp"%>
-				
-				<a href="#nogo" onclick="javascript:addUnit();" class="btn btn-xs btn-default button-add-item pull-right">
-					<fmt:message key="label.authoring.numerical.add.unit" />  
-				</a>
-			</form>
+			<div class="settings-tab">
+				<h5 class="voffset20">
+					<fmt:message key="label.authoring.numerical.units" />
+				</h5>			
+				<form id="unitForm" name="unitForm">
+					<%@ include file="unitlist.jsp"%>
+					
+					<a href="#nogo" onclick="javascript:addUnit();" class="btn btn-xs btn-default button-add-item pull-right">
+						<fmt:message key="label.authoring.numerical.add.unit" />  
+					</a>
+				</form>
+			</div>	
 
-			<div class="voffset10 pull-right clear-both">
+		</div>		
+	</div>	
+	
+	<footer class="footer fixed-bottom">
+		<div class="panel-heading">
+        	<div class="pull-right">
 			    <a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
 					<fmt:message key="label.cancel" />
 				</a>
 				<a href="#nogo" onclick="javascript:$('#assessmentQuestionForm').submit();" class="btn btn-sm btn-default button-add-item">
 					<fmt:message key="label.authoring.save.button" />
 				</a>
-				
-			</div>			
-
-		</div>
-		<!--closes content-->
-	
-		<div id="footer">
-		</div>
-		<!--closes footer-->		
-	</div>	
+			</div>	
+      	</div>
+    </footer>
 </body>
 </lams:html>
Index: lams_tool_assessment/web/pages/authoring/parts/addordering.jsp
===================================================================
diff -u -r67d7232f087b9f5c72ff41f7bbebe29cff81e099 -r8a65083cf102509e0ca486f636746f56a600c514
--- lams_tool_assessment/web/pages/authoring/parts/addordering.jsp	(.../addordering.jsp)	(revision 67d7232f087b9f5c72ff41f7bbebe29cff81e099)
+++ lams_tool_assessment/web/pages/authoring/parts/addordering.jsp	(.../addordering.jsp)	(revision 8a65083cf102509e0ca486f636746f56a600c514)
@@ -4,23 +4,11 @@
 
 <lams:html>
 	<lams:head>
-		<%@ include file="/common/header.jsp"%>
-		<link href="<lams:WebAppURL/>includes/css/addQuestion.css" rel="stylesheet" type="text/css">
-
-		<script type="text/javascript">
-			var questionType = ${questionType};
-			var addOptionUrl = "<c:url value='/authoring/addOption.do'/>";
-		   	var removeOptionUrl = "<c:url value='/authoring/removeOption.do'/>";
-    	    var upOptionUrl = "<c:url value='/authoring/upOption.do'/>";
-    	    var downOptionUrl = "<c:url value='/authoring/downOption.do'/>";
-		</script>
-		<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/assessmentoption.js"></script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
+		<%@ include file="/common/authoringQuestionHeader.jsp"%>
   	    <script>
 			$(document).ready(function(){
-				
 		    	$("#assessmentQuestionForm").validate({
+		    		ignore: 'hidden',
 		    		rules: {
 		    			title: "required",
 		    			defaultGrade: {
@@ -50,28 +38,16 @@
 		    			},
 		    			hasOptionFilled:  "<fmt:message key='label.authoring.numerical.error.answer'/>"
 		    		},
-		    	    invalidHandler: function(form, validator) {
-		    		      var errors = validator.numberOfInvalids();
-		    		      if (errors) {
-		    		          var message = errors == 1
-		    		          	  ? "<fmt:message key='error.form.validation.error'/>"
-		    		          	  : "<fmt:message key='error.form.validation.errors'><fmt:param >" + errors + "</fmt:param></fmt:message>";
-	    		          	  
-		    		          $("div.error span").html(message);
-		    		          $("div.error").show();
-		    		      } else {
-		    		          $("div.error").hide();
-		    		      }
-		    		},
+		    	    invalidHandler: formInvalidHandler,
 		    		debug: true,
 		    		errorClass: "alert alert-danger",
      			    submitHandler: function(form) {
      			    	prepareOptionEditorsForAjaxSubmit();
 		    			$("#optionList").val($("#optionForm").serialize(true));
 		    			$("#question").val(CKEDITOR.instances.question.getData());
 		    			$("#generalFeedback").val(CKEDITOR.instances.generalFeedback.getData());
-		    			$("#feedbackOnCorrect").val(CKEDITOR.instances.feedbackOnCorrectOutsideForm.getData());
-		    			$("#feedbackOnIncorrect").val(CKEDITOR.instances.feedbackOnIncorrectOutsideForm.getData());
+		    			$("#feedbackOnCorrect").val(CKEDITOR.instances.feedbackOnCorrect.getData());
+		    			$("#feedbackOnIncorrect").val(CKEDITOR.instances.feedbackOnIncorrect.getData());
 		    			
 		    	    	var options = { 
 		    	    		target:  parent.jQuery('#questionListArea'), 
@@ -83,28 +59,15 @@
 		  		});
 		    	
 			});
-    		// post-submit callback 
-    		function afterRatingSubmit(responseText, statusText)  { 
-    			self.parent.refreshThickbox()
-    			self.parent.tb_remove();
-    		}    
   		</script>
-		
 </lams:head>
 <body>
-	<div class="panel panel-default add-file">
+	<div class="panel-default add-file">
 		<div class="panel-heading panel-title">
 			<fmt:message key="label.authoring.basic.type.ordering" />
 		</div>
 			
 		<div class="panel-body">
-		
-			<lams:errors/>
-		    <div class="error">
-		    	<lams:Alert id="errorMessages" type="danger" close="false" >
-					<span></span>
-				</lams:Alert>	
-		    </div>		
 			
 			<form:form action="saveOrUpdateQuestion.do" method="post" modelAttribute="assessmentQuestionForm" id="assessmentQuestionForm">
 				<c:set var="sessionMap" value="${sessionScope[assessmentQuestionForm.sessionMapID]}" />
@@ -114,107 +77,111 @@
 				<input type="hidden" name="optionList" id="optionList" />
 				<form:hidden path="sequenceId" />
 				<form:hidden path="contentFolderID" id="contentFolderID"/>
-				<form:hidden path="feedbackOnCorrect" id="feedbackOnCorrect"/>
-				<form:hidden path="feedbackOnIncorrect" id="feedbackOnIncorrect"/>
+
+				<button type="button" id="question-settings-link" class="btn btn-default btn-sm">
+					<fmt:message key="label.settings" />
+				</button>
 				
-				<div class="form-group">
-				    <label for="title">
-				    	<fmt:message key="label.authoring.basic.question.name"/>
-				    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
-				    </label>
-				    <form:input path="title" maxlength="255" id="title" cssClass="form-control" tabindex="1"/>
+				<div class="question-tab">
+					<lams:errors/>
+					 <div class="error">
+				    	<lams:Alert id="errorMessages" type="danger" close="false" >
+							<span></span>
+						</lams:Alert>	
+				    </div>
+					
+					<div id="title-container" class="form-group">
+						<c:set var="TITLE_LABEL"><fmt:message key="label.enter.question.title"/> </c:set>
+					    <form:input path="title" id="title" cssClass="borderless-text-input" tabindex="1" maxlength="255" 
+					    	placeholder="${TITLE_LABEL}"/>
+					</div>
+				
+					<div class="form-group">
+						<c:set var="QUESTION_DESCRIPTION_LABEL"><fmt:message key="label.enter.question.description"/></c:set>
+						<lams:CKEditor id="question" value="${assessmentQuestionForm.question}" contentFolderID="${assessmentQuestionForm.contentFolderID}" 
+							placeholder="${QUESTION_DESCRIPTION_LABEL}"	 />
+					</div>
+					
+					<input type="text" name="hasOptionFilled" id="hasOptionFilled" class="fake-validation-input">
 				</div>
-			
-				<div class="form-group">
-					<label for="question">
-						<fmt:message key="label.authoring.basic.question.text" />
-					</label>
-		            	
-					<lams:CKEditor id="question" value="${assessmentQuestionForm.question}" contentFolderID="${assessmentQuestionForm.contentFolderID}" />
-				</div>
 
-				<div class="checkbox">
-					<label for="answer-required">
-						<form:checkbox path="answerRequired" id="answer-required"/>
-						<fmt:message key="label.authoring.answer.required" />
-					</label>
-				</div>
+				<div class="settings-tab">
+					 <div class="error">
+				    	<lams:Alert id="errorMessages" type="danger" close="false" >
+							<span></span>
+						</lams:Alert>	
+				    </div>
 				
-				<div class="form-group form-inline">
-					<c:if test="${!isAuthoringRestricted}">
-					    <label for="defaultGrade">
-					    	<fmt:message key="label.authoring.basic.default.question.grade" />:
-					    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
+					<div class="checkbox">
+						<label for="answer-required">
+							<form:checkbox path="answerRequired" id="answer-required"/>
+							<fmt:message key="label.authoring.answer.required" />
+						</label>
+					</div>
+					
+					<div class="form-group form-inline">
+						<c:if test="${!isAuthoringRestricted}">
+						    <label for="defaultGrade">
+						    	<fmt:message key="label.authoring.basic.default.question.grade" />:
+						    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
+						    </label>
+						    <form:input path="defaultGrade" cssClass="form-control short-input-text input-sm"/>
+					    </c:if>
+	
+					    <label class="loffset10" for="penaltyFactor">
+					    	<fmt:message key="label.authoring.basic.penalty.factor" />:
+							  <i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 					    </label>
-					    <form:input path="defaultGrade" cssClass="form-control short-input-text input-sm"/>
-				    </c:if>
-
-				    <label class="loffset10" for="penaltyFactor">
-				    	<fmt:message key="label.authoring.basic.penalty.factor" />:
-						  <i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
-				    </label>
-				    <form:input path="penaltyFactor" cssClass="form-control short-input-text input-sm"/>
-				</div>
-								
-				<div class="generalFeedback">
-				  <a data-toggle="collapse" data-target="#general-feedback" href="#general-fdback"><i class="fa fa-xs fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.basic.general.feedback" /></a>
-					<div id="general-feedback"  class="voffset5 collapse <c:if test="${not empty assessmentQuestionForm.generalFeedback}">in</c:if> form-group">
-						<lams:CKEditor id="generalFeedback" value="${assessmentQuestionForm.generalFeedback}" contentFolderID="${assessmentQuestionForm.contentFolderID}" />
+					    <form:input path="penaltyFactor" cssClass="form-control short-input-text input-sm"/>
 					</div>
-				</div>
-				
-				<h5 class="voffset20">
-					<fmt:message key="label.authoring.basic.answer.options" />
-				</h5>
-				<input type="text" name="hasOptionFilled" id="hasOptionFilled" class="fake-validation-input">
-			</form:form>
-			
-			<!-- Options -->
-			<form id="optionForm" name="optionForm" class="form-group">
-				<%@ include file="optionlist.jsp"%>
-				
-				<a href="#nogo" onclick="javascript:addOption();" class="btn btn-xs btn-default button-add-item pull-right">
-					<fmt:message key="label.authoring.choice.add.option" />  
-				</a>
-			</form>
+									
+					<div class="voffset5 form-group">
+						<c:set var="GENERAL_FEEDBACK_LABEL"><fmt:message key="label.authoring.basic.general.feedback"/></c:set>
+						<lams:CKEditor id="generalFeedback" value="${assessmentQuestionForm.generalFeedback}" 
+							placeholder="${GENERAL_FEEDBACK_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}" />
+					</div>
 						
-			<!-- Overall feedback -->
-			<div class="overallFeedback">
-			  <a data-toggle="collapse" data-target="#overall-feedback" href="#overall-fdback"><i class="fa fa-xs fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.choice.overall.feedback" /></a>
-
-				<div id="overall-feedback" class="collapse <c:if test="${(not empty assessmentQuestionForm.feedbackOnCorrect) || (not empty assessmentQuestionForm.feedbackOnIncorrect)}">in</c:if>">				
+					<!-- Overall feedback -->
+				
 					<div class="form-group">
-						<label for="feedbackOnCorrectOutsideForm">
-							<fmt:message key="label.authoring.choice.feedback.on.correct" />
-						</label>
-						<lams:CKEditor id="feedbackOnCorrectOutsideForm" value="${assessmentQuestionForm.feedbackOnCorrect}" contentFolderID="${assessmentQuestionForm.contentFolderID}"/>
+						<c:set var="FEEDBACK_ON_CORRECT_LABEL"><fmt:message key="label.authoring.choice.feedback.on.correct"/></c:set>
+						<lams:CKEditor id="feedbackOnCorrect" value="${assessmentQuestionForm.feedbackOnCorrect}" 
+							placeholder="${FEEDBACK_ON_CORRECT_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}"/>
 					</div>
 					
 					<div class="form-group">
-						<label for="feedbackOnIncorrectOutsideForm">
-							<fmt:message key="label.authoring.choice.feedback.on.incorrect" />
-						</label>
-						<lams:CKEditor id="feedbackOnIncorrectOutsideForm" value="${assessmentQuestionForm.feedbackOnIncorrect}" contentFolderID="${assessmentQuestionForm.contentFolderID}"/>
-					</div>
+						<c:set var="FEEDBACK_ON_INCORRECT_LABEL"><fmt:message key="label.authoring.choice.feedback.on.incorrect"/></c:set>
+						<lams:CKEditor id="feedbackOnIncorrect" value="${assessmentQuestionForm.feedbackOnIncorrect}" 
+							placeholder="${FEEDBACK_ON_INCORRECT_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}"/>
+					</div>	
 				</div>
+			</form:form>
+			
+			<!-- Options -->
+			<div class="question-tab">
+				<form id="optionForm" name="optionForm" class="form-group">
+					<%@ include file="optionlist.jsp"%>
+					
+					<a href="#nogo" onclick="javascript:addOption();" class="btn btn-xs btn-default button-add-item pull-right">
+						<fmt:message key="label.authoring.choice.add.option" />  
+					</a>
+				</form>
 			</div>
-		  <br/>
-			<div class="voffset10 pull-right">
+
+		</div>		
+	</div>	
+	
+	<footer class="footer fixed-bottom">
+		<div class="panel-heading">
+        	<div class="pull-right">
 			    <a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
 					<fmt:message key="label.cancel" />
 				</a>
 				<a href="#nogo" onclick="javascript:$('#assessmentQuestionForm').submit();" class="btn btn-sm btn-default button-add-item">
 					<fmt:message key="label.authoring.save.button" />
 				</a>
-				
-			</div>			
-
-		</div>
-		<!--closes content-->
-	
-		<div id="footer">
-		</div>
-		<!--closes footer-->		
-	</div>	
+			</div>	
+      	</div>
+    </footer>
 </body>
 </lams:html>
Index: lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp
===================================================================
diff -u -r67d7232f087b9f5c72ff41f7bbebe29cff81e099 -r8a65083cf102509e0ca486f636746f56a600c514
--- lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp	(.../addshortanswer.jsp)	(revision 67d7232f087b9f5c72ff41f7bbebe29cff81e099)
+++ lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp	(.../addshortanswer.jsp)	(revision 8a65083cf102509e0ca486f636746f56a600c514)
@@ -4,23 +4,11 @@
 
 <lams:html>
 	<lams:head>
-		<%@ include file="/common/header.jsp"%>
-		<link href="<lams:WebAppURL/>includes/css/addQuestion.css" rel="stylesheet" type="text/css">
-
-		<script type="text/javascript">
-			var questionType = ${questionType};
-			var addOptionUrl = "<c:url value='/authoring/addOption.do'/>";
-		   	var removeOptionUrl = "<c:url value='/authoring/removeOption.do'/>";
-    	    var upOptionUrl = "<c:url value='/authoring/upOption.do'/>";
-    	    var downOptionUrl = "<c:url value='/authoring/downOption.do'/>";
-		</script>
-		<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/assessmentoption.js"></script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
+		<%@ include file="/common/authoringQuestionHeader.jsp"%>
   	    <script>
 			$(document).ready(function(){
-				
 		    	$("#assessmentQuestionForm").validate({
+		    		ignore: 'hidden',
 		    		rules: {
 		    			title: "required",
 		    			defaultGrade: {
@@ -39,8 +27,8 @@
 	    			    hasOneHundredGrade: {
 		    				required: function(element) {
 		    					var hasOneHundredGrade = false;
-		    					$("select[name^='optionGrade']").each(function() {
-		    						hasOneHundredGrade = hasOneHundredGrade || (this.value == '1.0');
+		    					$("input[name^='optionGrade']").each(function() {
+		    						hasOneHundredGrade = hasOneHundredGrade || (eval(this.value) == 1);
 		    					});
 	    			    		return !hasOneHundredGrade;
 			    		    }			    		    
@@ -59,19 +47,7 @@
 		    			hasOptionFilled: "<fmt:message key='label.authoring.numerical.error.answer'/>",
 		    			hasOneHundredGrade: "<fmt:message key='error.form.validation.hundred.score'/>"
 		    		},
-		    	    invalidHandler: function(form, validator) {
-		    		      var errors = validator.numberOfInvalids();
-		    		      if (errors) {
-		    		          var message = errors == 1
-		    		          	  ? "<fmt:message key='error.form.validation.error'/>"
-		    		          	  : "<fmt:message key='error.form.validation.errors'><fmt:param >" + errors + "</fmt:param></fmt:message>";
-	    		          	  
-		    		          $("div.error span").html(message);
-		    		          $("div.error").show();
-		    		      } else {
-		    		          $("div.error").hide();
-		    		      }
-		    		},
+		    	    invalidHandler: formInvalidHandler,
 		    		debug: true,
 		    		errorClass: "alert alert-danger",
      			    submitHandler: function(form) {
@@ -89,28 +65,15 @@
 		    		}
 		  		});
 			});
-    		// post-submit callback 
-    		function afterRatingSubmit(responseText, statusText)  { 
-    			self.parent.refreshThickbox()
-    			self.parent.tb_remove();
-    		}    
   		</script>
-		
 </lams:head>
-	
 <body>
-	<div class="panel panel-default add-file">
+	<div class="panel-default add-file">
 		<div class="panel-heading panel-title">
 			<fmt:message key="label.authoring.basic.type.short.answer" />
 		</div>
 
 		<div class="panel-body">
-			<lams:errors/>
-		    <div class="error">
-		    	<lams:Alert id="errorMessages" type="danger" close="false" >
-					<span></span>
-				</lams:Alert>	
-		    </div>
 			
 			<form:form action="saveOrUpdateQuestion.do" method="post" modelAttribute="assessmentQuestionForm" id="assessmentQuestionForm">
 				<c:set var="sessionMap" value="${sessionScope[assessmentQuestionForm.sessionMapID]}" />
@@ -120,95 +83,109 @@
 				<input type="hidden" name="optionList" id="optionList" />
 				<form:hidden path="sequenceId" />
 				<form:hidden path="contentFolderID" id="contentFolderID"/>
+
+				<button type="button" id="question-settings-link" class="btn btn-default btn-sm">
+					<fmt:message key="label.settings" />
+				</button>
 				
-				<div class="form-group">
-				    <label for="title">
-				    	<fmt:message key="label.authoring.basic.question.name"/>
-				    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="* <fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
-				    </label>
-				    <form:input path="title" maxlength="255" id="title" cssClass="form-control" tabindex="1"/>
-				</div>
-			
-				<div class="form-group">
-					<label for="question">
-						<fmt:message key="label.authoring.basic.question.text" />
-					</label>
-		            	
-					<lams:CKEditor id="question" value="${assessmentQuestionForm.question}" contentFolderID="${assessmentQuestionForm.contentFolderID}" />
-				</div>
+				<div class="question-tab">
+					<lams:errors/>
+					 <div class="error">
+				    	<lams:Alert id="errorMessages" type="danger" close="false" >
+							<span></span>
+						</lams:Alert>	
+				    </div>
+					
+					<div id="title-container" class="form-group">
+						<c:set var="TITLE_LABEL"><fmt:message key="label.enter.question.title"/> </c:set>
+					    <form:input path="title" id="title" cssClass="borderless-text-input" tabindex="1" maxlength="255"
+					    	placeholder="${TITLE_LABEL}"/>
+					</div>
 				
-				<div class="checkbox">
-					<label for="answer-required">
-						<form:checkbox path="answerRequired" id="answer-required"/>
-						<fmt:message key="label.authoring.answer.required" />
-					</label>
+					<div class="form-group">
+						<c:set var="QUESTION_DESCRIPTION_LABEL"><fmt:message key="label.enter.question.description"/></c:set>
+						<lams:CKEditor id="question" value="${assessmentQuestionForm.question}" contentFolderID="${assessmentQuestionForm.contentFolderID}" 
+							placeholder="${QUESTION_DESCRIPTION_LABEL}"	 />
+					</div>
+					
+					<input type="text" name="hasOptionFilled" id="hasOptionFilled" class="fake-validation-input">
+					<input type="text" name="hasOneHundredGrade" id="hasOneHundredGrade" class="fake-validation-input">
 				</div>
 				
-				<div class="form-group form-inline">
-					<c:if test="${!isAuthoringRestricted}">
-					    <label for="defaultGrade">
-					    	<fmt:message key="label.authoring.basic.default.question.grade" />:
-					    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
+				<div class="settings-tab">
+					 <div class="error">
+				    	<lams:Alert id="errorMessages" type="danger" close="false" >
+							<span></span>
+						</lams:Alert>	
+				    </div>
+				
+					<div class="checkbox">
+						<label for="answer-required">
+							<form:checkbox path="answerRequired" id="answer-required"/>
+							<fmt:message key="label.authoring.answer.required" />
+						</label>
+					</div>
+					
+					<div class="form-group form-inline">
+						<c:if test="${!isAuthoringRestricted}">
+						    <label for="defaultGrade">
+						    	<fmt:message key="label.authoring.basic.default.question.grade" />:
+						    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
+						    </label>
+						    <form:input path="defaultGrade" cssClass="form-control short-input-text input-sm"/>
+					    </c:if>
+					    
+					    <label class="loffset10" for="penaltyFactor"> 
+					    	<fmt:message key="label.authoring.basic.penalty.factor" />:
+							<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
 					    </label>
-					    <form:input path="defaultGrade" cssClass="form-control short-input-text input-sm"/>
-				    </c:if>
-				    
-				    <label class="loffset10" for="penaltyFactor"> 
-				    	<fmt:message key="label.authoring.basic.penalty.factor" />:
-						<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
-				    </label>
-				    <form:input path="penaltyFactor" cssClass="form-control short-input-text input-sm"/>
-				</div>
-																	
-				<div class="form-inline form-group">
-					<label for="caseSensitive">
-						<fmt:message key="label.authoring.short.answer.case.sensitivity" />:
-					</label>
-					<form:select path="caseSensitive" cssClass="form-control input-sm">
-						<form:option value="false"><fmt:message key="label.authoring.short.answer.no.case.unimportant" /></form:option>
-						<form:option value="true"><fmt:message key="label.authoring.short.answer.yes.case.must.match" /></form:option>
-					</form:select>
-				</div>
-
-				<div class="generalFeedback">
-				  <a data-toggle="collapse" data-target="#general-feedback" href="#general-fdback"><i class="fa fa-xs fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.basic.general.feedback" /></a>
-					<div id="general-feedback"  class="voffset5 collapse <c:if test="${not empty assessmentQuestionForm.generalFeedback}">in</c:if> form-group">
-						<lams:CKEditor id="generalFeedback" value="${assessmentQuestionForm.generalFeedback}" contentFolderID="${assessmentQuestionForm.contentFolderID}" />
+					    <form:input path="penaltyFactor" cssClass="form-control short-input-text input-sm"/>
 					</div>
+																		
+					<div class="form-inline form-group">
+						<label for="caseSensitive">
+							<fmt:message key="label.authoring.short.answer.case.sensitivity" />:
+						</label>
+						<form:select path="caseSensitive" cssClass="form-control input-sm">
+							<form:option value="false"><fmt:message key="label.authoring.short.answer.no.case.unimportant" /></form:option>
+							<form:option value="true"><fmt:message key="label.authoring.short.answer.yes.case.must.match" /></form:option>
+						</form:select>
+					</div>
+	
+					<div class="voffset5 form-group">
+						<c:set var="GENERAL_FEEDBACK_LABEL"><fmt:message key="label.authoring.basic.general.feedback"/></c:set>
+						<lams:CKEditor id="generalFeedback" value="${assessmentQuestionForm.generalFeedback}" 
+							placeholder="${GENERAL_FEEDBACK_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}" />
+					</div>
 				</div>
-				
-				<h5 class="voffset20">
-					<fmt:message key="label.authoring.short.answer.answers" />
-				</h5>
-				<input type="text" name="hasOptionFilled" id="hasOptionFilled" class="fake-validation-input">
-				<input type="text" name="hasOneHundredGrade" id="hasOneHundredGrade" class="fake-validation-input">
+
 			</form:form>
 			
 			<!-- Options -->
-			<form id="optionForm" name="optionForm">
-				<%@ include file="optionlist.jsp"%>
-				
-				<a href="#nogo" onclick="javascript:addOption();" class="btn btn-xs btn-default button-add-item pull-right">
-					<fmt:message key="label.authoring.short.answer.add.answer" />  
-				</a>
-			</form>
+			<div class="question-tab">
+				<form id="optionForm" name="optionForm">
+					<%@ include file="optionlist.jsp"%>
+					
+					<a href="#nogo" onclick="javascript:addOption();" class="btn btn-xs btn-default button-add-item pull-right">
+						<fmt:message key="label.authoring.short.answer.add.answer" />  
+					</a>
+				</form>	
+			</div>	
 
-			<div class="voffset10 pull-right clear-both">
+		</div>	
+	</div>	
+	
+	<footer class="footer fixed-bottom">
+		<div class="panel-heading">
+        	<div class="pull-right">
 			    <a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
 					<fmt:message key="label.cancel" />
 				</a>
 				<a href="#nogo" onclick="javascript:$('#assessmentQuestionForm').submit();" class="btn btn-sm btn-default button-add-item">
 					<fmt:message key="label.authoring.save.button" />
 				</a>
-				
-			</div>			
-
-		</div>
-		<!--closes content-->
-	
-		<div id="footer">
-		</div>
-		<!--closes footer-->		
-	</div>	
+			</div>	
+      	</div>
+    </footer>
 </body>
 </lams:html>
Index: lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp
===================================================================
diff -u -r67d7232f087b9f5c72ff41f7bbebe29cff81e099 -r8a65083cf102509e0ca486f636746f56a600c514
--- lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp	(.../addtruefalse.jsp)	(revision 67d7232f087b9f5c72ff41f7bbebe29cff81e099)
+++ lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp	(.../addtruefalse.jsp)	(revision 8a65083cf102509e0ca486f636746f56a600c514)
@@ -7,12 +7,17 @@
 		<%@ include file="/common/header.jsp"%>
 		<link href="<lams:WebAppURL/>includes/css/addQuestion.css" rel="stylesheet" type="text/css">
 
+		<script type="text/javascript">
+			const VALIDATION_ERROR_LABEL = "<fmt:message key='error.form.validation.error'/>";
+			const VALIDATION_ERRORS_LABEL = "<fmt:message key='error.form.validation.errors'><fmt:param >{errors_counter}</fmt:param></fmt:message>";
+		</script>
+		<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/authoring-question.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
   	    <script>
 			$(document).ready(function(){
-				
 		    	$("#assessmentQuestionForm").validate({
+		    		ignore: 'hidden',
 		    		rules: {
 		    			title: "required",
 		    			defaultGrade: {
@@ -35,19 +40,7 @@
 		    				number: "<fmt:message key='label.authoring.choice.enter.float'/>"
 		    			}
 		    		},
-		    	    invalidHandler: function(form, validator) {
-		    		      var errors = validator.numberOfInvalids();
-		    		      if (errors) {
-		    		          var message = errors == 1
-		    		          	  ? "<fmt:message key='error.form.validation.error'/>"
-		    		          	  : "<fmt:message key='error.form.validation.errors'><fmt:param >" + errors + "</fmt:param></fmt:message>";
-	    		          	  
-		    		          $("div.error span").html(message);
-		    		          $("div.error").show();
-		    		      } else {
-		    		          $("div.error").hide();
-		    		      }
-		    		},
+		    	    invalidHandler: formInvalidHandler,
 		    		debug: true,
 		    		errorClass: "alert alert-danger",
      			    submitHandler: function(form) {
@@ -65,129 +58,120 @@
 		    		}
 		  		});
 			});
-    		// post-submit callback 
-    		function afterRatingSubmit(responseText, statusText)  { 
-    			self.parent.refreshThickbox()
-    			self.parent.tb_remove();
-    		}    
   		</script>
-		
 </lams:head>
 <body>
-	<div class="panel panel-default add-file">
+	<div class="panel-default add-file">
 		<div class="panel-heading panel-title">
 			<fmt:message key="label.authoring.true.false.question" />
 		</div>
 			
 		<div class="panel-body">
-			<lams:errors/>
-		    <div class="error">
-		    	<lams:Alert id="errorMessages" type="danger" close="false" >
-					<span></span>
-				</lams:Alert>	
-		    </div>
-			
 			<form:form action="saveOrUpdateQuestion.do" method="post" modelAttribute="assessmentQuestionForm" id="assessmentQuestionForm">
 				<c:set var="sessionMap" value="${sessionScope[assessmentQuestionForm.sessionMapID]}" />
 				<c:set var="isAuthoringRestricted" value="${sessionMap.isAuthoringRestricted}" />
 				<form:hidden path="sessionMapID" />
 				<input type="hidden" name="questionType" id="questionType" value="${questionType}" />
 				<form:hidden path="sequenceId" />
 
-				<div class="form-group">
-				    <label for="title">
-				    	<fmt:message key="label.authoring.basic.question.name"/>
-				    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
-				    </label>
-				    <form:input path="title" maxlength="255" id="title" cssClass="form-control" tabindex="1"/>
-				</div>
-			
-				<div class="form-group">
-					<label for="question">
-						<fmt:message key="label.authoring.basic.question.text" />
-					</label>
-		            	
-					<lams:CKEditor id="question" value="${assessmentQuestionForm.question}" contentFolderID="${assessmentQuestionForm.contentFolderID}" />
-				</div>
+				<button type="button" id="question-settings-link" class="btn btn-default btn-sm">
+					<fmt:message key="label.settings" />
+				</button>
 				
-				<div class="checkbox">
-					<label for="answer-required">
-						<form:checkbox path="answerRequired" id="answer-required"/>
-						<fmt:message key="label.authoring.answer.required" />
-					</label>
-				</div>				
+				<div class="question-tab">
+					<lams:errors/>
+					 <div class="error">
+				    	<lams:Alert id="errorMessages" type="danger" close="false" >
+							<span></span>
+						</lams:Alert>	
+				    </div>
+	
+					<div id="title-container" class="form-group">
+						<c:set var="TITLE_LABEL"><fmt:message key="label.enter.question.title"/> </c:set>
+					    <form:input path="title" id="title" cssClass="borderless-text-input" tabindex="1" maxlength="255"
+					    	placeholder="${TITLE_LABEL}"/>
+					</div>
 				
-				<div class="form-group form-inline">
-					<c:if test="${!isAuthoringRestricted}">
-					    <label for="defaultGrade">
-					    	<fmt:message key="label.authoring.basic.default.question.grade" />:
-					    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
-					    </label>
-					    <form:input path="defaultGrade" cssClass="form-control short-input-text input-sm"/>
-				    </c:if>
-				    
-				    <label class="loffset10" for="penaltyFactor">
-				    	<fmt:message key="label.authoring.basic.penalty.factor" />:
-						<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
-				    </label>
-				    <form:input path="penaltyFactor" cssClass="form-control short-input-text input-sm"/>
-				</div>
-								
-				<div class="generalFeedback">
-				  <a data-toggle="collapse" data-target="#general-feedback" href="#general-fdback"><i class="fa fa-xs fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.basic.general.feedback" /></a>
-					<div id="general-feedback"  class="collapse <c:if test="${not empty assessmentQuestionForm.generalFeedback}">in</c:if> form-group">
-						<lams:CKEditor id="generalFeedback" value="${assessmentQuestionForm.generalFeedback}" contentFolderID="${assessmentQuestionForm.contentFolderID}" />
+					<div class="form-group">
+						<c:set var="QUESTION_DESCRIPTION_LABEL"><fmt:message key="label.enter.question.description"/></c:set>
+						<lams:CKEditor id="question" value="${assessmentQuestionForm.question}" contentFolderID="${assessmentQuestionForm.contentFolderID}" 
+							placeholder="${QUESTION_DESCRIPTION_LABEL}"	 />
 					</div>
-				</div>
 				
-				<hr>
-				
-				<div class="voffset10 form-inline form-group">
-					<label for="correctAnswer">
-						<fmt:message key="label.authoring.true.false.correct.answer" />
-					</label>
-					<form:select path="correctAnswer" cssClass="form-control input-sm">
-						<form:option value="false"><fmt:message key="label.authoring.true.false.false" /></form:option>
-						<form:option value="true"><fmt:message key="label.authoring.true.false.true" /></form:option>
-					</form:select>
+					<div class="voffset10 form-inline form-group">
+						<label for="correctAnswer">
+							<fmt:message key="label.authoring.true.false.correct.answer" />
+						</label>
+						<form:select path="correctAnswer" cssClass="form-control input-sm">
+							<form:option value="false"><fmt:message key="label.authoring.true.false.false" /></form:option>
+							<form:option value="true"><fmt:message key="label.authoring.true.false.true" /></form:option>
+						</form:select>
+					</div>
 				</div>
 				
-				<a data-toggle="collapse" data-target="#feedback" href="#fdback"><i class="fa fa-xs fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.basic.option.feedback"></fmt:message></a>
-				<div id="feedback" class="voffset5 collapse  <c:if test="${(not empty assessmentQuestionForm.feedbackOnCorrect) || (not empty assessmentQuestionForm.feedbackOnIncorrect)}">in</c:if>">
-					<div class="form-group voffset10">
-						<label for="feedbackOnCorrect">
-							<fmt:message key="label.authoring.true.false.feedback.on.true" />
+				<div class="settings-tab">
+					 <div class="error">
+				    	<lams:Alert id="errorMessages" type="danger" close="false" >
+							<span></span>
+						</lams:Alert>	
+				    </div>
+				
+					<div class="checkbox">
+						<label for="answer-required">
+							<form:checkbox path="answerRequired" id="answer-required"/>
+							<fmt:message key="label.authoring.answer.required" />
 						</label>
-			            	
-						<lams:CKEditor id="feedbackOnCorrect" value="${assessmentQuestionForm.feedbackOnCorrect}" contentFolderID="${assessmentQuestionForm.contentFolderID}"/>
+					</div>				
+					
+					<div class="form-group form-inline">
+						<c:if test="${!isAuthoringRestricted}">
+						    <label for="defaultGrade">
+						    	<fmt:message key="label.authoring.basic.default.question.grade" />:
+						    	<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
+						    </label>
+						    <form:input path="defaultGrade" cssClass="form-control short-input-text input-sm"/>
+					    </c:if>
+					    
+					    <label class="loffset10" for="penaltyFactor">
+					    	<fmt:message key="label.authoring.basic.penalty.factor" />:
+							<i class="fa fa-xs fa-asterisk text-danger pull-right" title="<fmt:message key="label.required.field"/>" alt="<fmt:message key="label.required.field"/>"></i>
+					    </label>
+					    <form:input path="penaltyFactor" cssClass="form-control short-input-text input-sm"/>
 					</div>
+									
+					<div class="voffset5 form-group">
+						<c:set var="GENERAL_FEEDBACK_LABEL"><fmt:message key="label.authoring.basic.general.feedback"/></c:set>
+						<lams:CKEditor id="generalFeedback" value="${assessmentQuestionForm.generalFeedback}" 
+							placeholder="${GENERAL_FEEDBACK_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}" />
+					</div>
 					
 					<div class="form-group">
-						<label for="feedbackOnIncorrect">
-							<fmt:message key="label.authoring.true.false.feedback.on.false" />
-						</label>
-			            	
-						<lams:CKEditor id="feedbackOnIncorrect" value="${assessmentQuestionForm.feedbackOnIncorrect}" contentFolderID="${assessmentQuestionForm.contentFolderID}"/>
+				    	<c:set var="FEEDBACK_ON_TRUE_LABEL"><fmt:message key="label.authoring.true.false.feedback.on.true"/></c:set>
+						<lams:CKEditor id="feedbackOnCorrect" value="${assessmentQuestionForm.feedbackOnCorrect}" 
+							placeholder="${FEEDBACK_ON_TRUE_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}"/>
 					</div>
+						
+					<div class="form-group">
+				        <c:set var="FEEDBACK_ON_FALSE_LABEL"><fmt:message key="label.authoring.true.false.feedback.on.false"/></c:set>
+						<lams:CKEditor id="feedbackOnIncorrect" value="${assessmentQuestionForm.feedbackOnIncorrect}" 
+							placeholder="${FEEDBACK_ON_FALSE_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}"/>
+					</div>
 				</div>
 			</form:form>
-
-			<div class="voffset10 pull-right">
+		</div>	
+	</div>
+	
+	<footer class="footer fixed-bottom">
+		<div class="panel-heading">
+        	<div class="pull-right">
 			    <a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
 					<fmt:message key="label.cancel" />
 				</a>
 				<a href="#nogo" onclick="javascript:$('#assessmentQuestionForm').submit();" class="btn btn-sm btn-default button-add-item">
 					<fmt:message key="label.authoring.save.button" />
 				</a>
-				
-			</div>			
-
-		</div>
-		<!--closes content-->
-	
-		<div id="footer">
-		</div>
-		<!--closes footer-->		
-	</div>	
+			</div>	
+      	</div>
+    </footer>
 </body>
 </lams:html>
Index: lams_tool_assessment/web/pages/authoring/parts/gradeselector.jsp
===================================================================
diff -u -r4353f26f9509808acdf41d0deef6cf5fd458a2b7 -r8a65083cf102509e0ca486f636746f56a600c514
--- lams_tool_assessment/web/pages/authoring/parts/gradeselector.jsp	(.../gradeselector.jsp)	(revision 4353f26f9509808acdf41d0deef6cf5fd458a2b7)
+++ lams_tool_assessment/web/pages/authoring/parts/gradeselector.jsp	(.../gradeselector.jsp)	(revision 8a65083cf102509e0ca486f636746f56a600c514)
@@ -1,50 +1,11 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<select name="optionGrade${status.index}" id="optionGrade${status.index}" class="form-control input-sm short-input-text">
-	<option value="1.0">100 %</option>
-	<option value="0.9">90 %</option>
-	<option value="0.83333">83.333 %</option>
-	<option value="0.8">80 %</option>
-	<option value="0.75">75%</option>
-	<option value="0.7">70 %</option>
-	<option value="0.66666">66.666 %</option>
-	<option value="0.6">60 %</option>
-	<option value="0.5">50 %</option>
-	<option value="0.4">40 %</option>
-	<option value="0.33333">33.333 %</option>
-	<option value="0.3">30 %</option>
-	<option value="0.25">25 %</option>
-	<option value="0.2">20 %</option>
-	<option value="0.16666">16.666 %</option>
-	<option value="0.142857">14.2857 %</option>
-	<option value="0.125">12.5 %</option>
-	<option value="0.11111">11.111 %</option>
-	<option value="0.1">10 %</option>
-	<option value="0.05">5 %</option>
-	<option value="0.0"><fmt:message key="label.authoring.basic.none" /></option>
-	<option value="-0.05">-5 %</option>	
-	<option value="-0.1">-10 %</option>
-	<option value="-0.11111">-11.111 %</option>
-	<option value="-0.125">-12.5 %</option>
-	<option value="-0.142857">-14.2857 %</option>
-	<option value="-0.16666">-16.666 %</option>
-	<option value="-0.2">-20 %</option>
-	<option value="-0.25">-25 %</option>
-	<option value="-0.3">-30 %</option>	
-	<option value="-0.33333">-33.333 %</option>
-	<option value="-0.4">-40 %</option>
-	<option value="-0.5">-50 %</option>
-	<option value="-0.6">-60 %</option>
-	<option value="-0.66666">-66.666 %</option>
-	<option value="-0.7">-70 %</option>
-	<option value="-0.75">-75 %</option>	
-	<option value="-0.8">-80 %</option>
-	<option value="-0.83333">-83.333 %</option>
-	<option value="-0.9">-90 %</option>
-	<option value="-1.0">-100 %</option>
-</select>
-
-<script type="text/javascript">
-	//setting initial value
-	$("#optionGrade${status.index}").val("${option.grade}");
-</script>
+<div class="grade-slider form-group">
+	<div class="col-sm-1 greyed-out-label">
+		<fmt:message key="label.authoring.basic.option.grade"/>
+	</div>
+    <div class="col-sm-5">
+       	<div class="slider"></div>
+       	<input type="hidden" name="optionGrade${status.index}" id="optionGrade${status.index}" value="${option.grade}">
+    </div>
+</div>
Index: lams_tool_assessment/web/pages/authoring/parts/matchingpairoption.jsp
===================================================================
diff -u -r67d7232f087b9f5c72ff41f7bbebe29cff81e099 -r8a65083cf102509e0ca486f636746f56a600c514
--- lams_tool_assessment/web/pages/authoring/parts/matchingpairoption.jsp	(.../matchingpairoption.jsp)	(revision 67d7232f087b9f5c72ff41f7bbebe29cff81e099)
+++ lams_tool_assessment/web/pages/authoring/parts/matchingpairoption.jsp	(.../matchingpairoption.jsp)	(revision 8a65083cf102509e0ca486f636746f56a600c514)
@@ -1,17 +1,14 @@
 <input type="hidden" name="optionSequenceId${status.index}" value="${option.sequenceId}">
 <input type="hidden" name="optionUid${status.index}" value="${option.uid}">
 
-<div class="form-group">
-	<label for="optionQuestion${status.index}">
-		<fmt:message key="label.authoring.basic.option.question"/>&nbsp;${status.index+1}
-	</label>
-		            	
-	<lams:CKEditor id="optionQuestion${status.index}" value="${option.question}" contentFolderID="${contentFolderID}"/>
+<div class="voffset5-bottom option-ckeditor">
+	<c:set var="QUESTION_LABEL"><fmt:message key="label.authoring.basic.option.question"/></c:set>      	
+	<lams:CKEditor id="optionQuestion${status.index}" value="${option.question}" contentFolderID="${contentFolderID}"
+		placeholder="${QUESTION_LABEL}&thinsp; ${status.index+1}" height="40px"/>
 </div>
 
 <div class="form-group">
-    <label for="optionFeedback${status.index}">
-    	<fmt:message key="label.authoring.basic.option.answer"></fmt:message>
-    </label>
-    <input type="text" name="optionString${status.index}" value="${option.optionString}" id="optionString${status.index}" class="form-control">
+    <c:set var="OPTION_LABEL"><fmt:message key="label.authoring.basic.option.answer"/></c:set>
+    <input type="text" name="optionString${status.index}" id="optionString${status.index}" class="borderless-text-input"  
+    	value="${option.optionString}" placeholder="${OPTION_LABEL}&thinsp; ${status.index+1}">
 </div>
Index: lams_tool_assessment/web/pages/authoring/parts/numericaloption.jsp
===================================================================
diff -u -r67d7232f087b9f5c72ff41f7bbebe29cff81e099 -r8a65083cf102509e0ca486f636746f56a600c514
--- lams_tool_assessment/web/pages/authoring/parts/numericaloption.jsp	(.../numericaloption.jsp)	(revision 67d7232f087b9f5c72ff41f7bbebe29cff81e099)
+++ lams_tool_assessment/web/pages/authoring/parts/numericaloption.jsp	(.../numericaloption.jsp)	(revision 8a65083cf102509e0ca486f636746f56a600c514)
@@ -1,54 +1,40 @@
 <input type="hidden" name="optionSequenceId${status.index}" value="${option.sequenceId}">
 <input type="hidden" name="optionUid${status.index}" value="${option.uid}">
 
-<table class="table-row-spacing">
+<table class="table-row-spacing" style="margin-left: -4px;">
 	<tr>
-		<td style="width: 120px;">
+		<td style="width: 100px;" class="greyed-out-label">
 			<fmt:message key="label.authoring.basic.option.answer"/>&nbsp;${status.index+1}
 		</td>
 		<td>
 			<div class="form-inline">    	
 				<input type="text" name="optionFloat${status.index}" value="${option.optionFloat}" 
-						id="optionFloat${status.index}" class="number form-control short-input-text input-sm" 
+						id="optionFloat${status.index}" class="number form-control short-input-text input-xs" 
 						title="<fmt:message key='label.authoring.choice.enter.float'/>">
 			</div>
 		</td>
 	</tr>
 
-	<tr>
-		<td>
+	<tr class="settings-on-hover-hidden">
+		<td class="greyed-out-label">
 			<fmt:message key="label.authoring.basic.option.accepted.error"></fmt:message>
 		</td>
 		<td>
 			<div class="form-inline">	
 				<input type="text" name="optionAcceptedError${status.index}" value="${option.acceptedError}"
-						id="optionAcceptedError${status.index}" class="number form-control short-input-text input-sm" 
+						id="optionAcceptedError${status.index}" class="number form-control short-input-text input-xs" 
 						title="<fmt:message key='label.authoring.choice.enter.float'/>">
 			</div>
 		</td>
 	</tr>
-
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.basic.option.grade"></fmt:message>
-		</td>
-		<td>
-			<div class="form-inline">
-				<%@ include file="gradeselector.jsp"%>
-			</div>
-		</td>
-	</tr>
-
-	<tr>
-		<td colspan="2">
-			<div class="form-group">
-				<label for="optionFeedback${status.index}">
-					<a data-toggle="collapse" data-target="#feedback${status.index}" href="#fback${status.index}"><i class="fa fa-xs fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.basic.option.feedback"></fmt:message></a>
-				</label>
-				<div id="feedback${status.index}" class="collapse <c:if test="${not empty option.feedback}">in</c:if>">
-					<lams:CKEditor id="optionFeedback${status.index}" value="${option.feedback}" contentFolderID="${contentFolderID}"/>
-				</div>	
-			</div>
-		</td>
-	</tr>
 </table>
+
+<div class="settings-on-hover-hidden">
+	<%@ include file="gradeselector.jsp"%>
+	
+	<div class="voffset5-bottom">
+	   	<c:set var="FEEDBACK_LABEL"><fmt:message key="label.authoring.basic.option.feedback"/></c:set>
+	   	<lams:CKEditor id="optionFeedback${status.index}" value="${option.feedback}" 
+	     	placeholder="${FEEDBACK_LABEL}" contentFolderID="${contentFolderID}" height="40px"/>
+	</div>
+</div>
Index: lams_tool_assessment/web/pages/authoring/parts/option.jsp
===================================================================
diff -u -rc2dd5ccedb6cfa8bb4df16752c99c2c2d13478a0 -r8a65083cf102509e0ca486f636746f56a600c514
--- lams_tool_assessment/web/pages/authoring/parts/option.jsp	(.../option.jsp)	(revision c2dd5ccedb6cfa8bb4df16752c99c2c2d13478a0)
+++ lams_tool_assessment/web/pages/authoring/parts/option.jsp	(.../option.jsp)	(revision 8a65083cf102509e0ca486f636746f56a600c514)
@@ -1,28 +1,18 @@
 <input type="hidden" name="optionSequenceId${status.index}" value="${option.sequenceId}">
 <input type="hidden" name="optionUid${status.index}" value="${option.uid}">
 
-<div class="option-text">
+<div class="option-ckeditor">
 	<c:set var="OPTION_LABEL"><fmt:message key="label.authoring.basic.option.answer"/></c:set>
-	<lams:CKEditor id="optionString${status.index}" classes="ckeditor-without-borders" value="${option.optionString}" 
+	<lams:CKEditor id="optionString${status.index}" value="${option.optionString}" 
 		placeholder="${OPTION_LABEL}&thinsp; ${status.index+1}" contentFolderID="${contentFolderID}" height="50px"/>
 </div>
 
-<div class="option-settings">
-	<div class="form-group form-inline">
-		<div class="price-slider">
-			<div class="col-sm-1" style="margin-top: -7px; padding: 0; opacity: 0.55;">
-				<fmt:message key="label.authoring.basic.option.grade"/>
-			</div>
-            <div class="col-sm-5">
-            	<div class="slider"></div>
-            	<input type="hidden" name="optionGrade${status.index}" id="optionGrade${status.index}" value="${option.grade}">
-            </div>
-        </div>
-	</div>
+<div class="settings-on-hover-hidden">
+	<%@ include file="gradeselector.jsp"%>
 
-	<div style="margin-bottom: 5px;">
+	<div class="voffset5-bottom">
     	<c:set var="FEEDBACK_LABEL"><fmt:message key="label.authoring.basic.option.feedback"/></c:set>
-     	<lams:CKEditor id="optionFeedback${status.index}" classes="ckeditor-without-borders" value="${option.feedback}" 
+     	<lams:CKEditor id="optionFeedback${status.index}" value="${option.feedback}" 
 	     	placeholder="${FEEDBACK_LABEL}" contentFolderID="${contentFolderID}" height="50px"/>
 	</div>
 </div>
\ No newline at end of file
Index: lams_tool_assessment/web/pages/authoring/parts/optionhedgingmark.jsp
===================================================================
diff -u -r67d7232f087b9f5c72ff41f7bbebe29cff81e099 -r8a65083cf102509e0ca486f636746f56a600c514
--- lams_tool_assessment/web/pages/authoring/parts/optionhedgingmark.jsp	(.../optionhedgingmark.jsp)	(revision 67d7232f087b9f5c72ff41f7bbebe29cff81e099)
+++ lams_tool_assessment/web/pages/authoring/parts/optionhedgingmark.jsp	(.../optionhedgingmark.jsp)	(revision 8a65083cf102509e0ca486f636746f56a600c514)
@@ -1,28 +1,26 @@
 <input type="hidden" name="optionSequenceId${status.index}" value="${option.sequenceId}">
 <input type="hidden" name="optionUid${status.index}" value="${option.uid}">
 
-<div class="form-group">
-	<label for="optionString${status.index}">
-		<fmt:message key="label.authoring.basic.option.answer"/>&nbsp;${status.index+1}
-	</label>
-	<lams:CKEditor id="optionString${status.index}" value="${option.optionString}" contentFolderID="${contentFolderID}" />
+<div class="option-ckeditor">
+	<c:set var="OPTION_ANSWER_LABEL"><fmt:message key="label.authoring.basic.option.answer"/></c:set>
+	<lams:CKEditor id="optionString${status.index}" value="${option.optionString}" contentFolderID="${contentFolderID}" 
+		placeholder="${OPTION_ANSWER_LABEL}&thinsp; ${status.index+1}" height="50px"/>
 </div>
 
-<div class="radio">
-	<label for="option-correct">
-		<input type="radio" alt="${status.index}" name="optionCorrect" value="${option.sequenceId}" id="option-correct"
-				<c:if test="${option.correct}">checked="checked"</c:if> >
-					
-		<fmt:message key="label.option.correct" />
-	</label>
+<div class="settings-on-hover-hidden">
+	<div class="radio">
+		<label for="option-correct">
+			<input type="radio" alt="${status.index}" name="optionCorrect" value="${option.sequenceId}" id="option-correct"
+					<c:if test="${option.correct}">checked="checked"</c:if> >
+			<span class="greyed-out-label">
+				<fmt:message key="label.option.correct" />
+			</span>
+		</label>
+	</div>
+	
+	<div class="voffset5-bottom">
+	    <c:set var="FEEDBACK_LABEL"><fmt:message key="label.authoring.basic.option.feedback"/></c:set>
+	    <lams:CKEditor id="optionFeedback${status.index}" value="${option.feedback}"
+	    	placeholder="${FEEDBACK_LABEL}" contentFolderID="${contentFolderID}" height="50px"/>
+	</div>
 </div>
-
-<div class="form-group">
-    <label for="optionFeedback${status.index}">
-    	<a data-toggle="collapse" data-target="#feedback${status.index}" href="#fback${status.index}"><i class="fa fa-xs fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.basic.option.feedback"></fmt:message></a>
-    </label>
-    <div id="feedback${status.index}" class="collapse <c:if test="${not empty option.feedback}">in</c:if>">
-    	<lams:CKEditor id="optionFeedback${status.index}" value="${option.feedback}" contentFolderID="${contentFolderID}" />
-    </div>	
-</div>
-
Index: lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp
===================================================================
diff -u -rc2dd5ccedb6cfa8bb4df16752c99c2c2d13478a0 -r8a65083cf102509e0ca486f636746f56a600c514
--- lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp	(.../optionlist.jsp)	(revision c2dd5ccedb6cfa8bb4df16752c99c2c2d13478a0)
+++ lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp	(.../optionlist.jsp)	(revision 8a65083cf102509e0ca486f636746f56a600c514)
@@ -1,10 +1,4 @@
 <%@ include file="/common/taglibs.jsp"%>
-<script>
-$(document).ready(function(){
-	//update slider's label with the initial value
-	$('.slider').trigger('slide');
-})
-</script>
 
 <div id="optionArea">
 	<input type="hidden" name="optionCount" id="optionCount" value="${fn:length(optionList)}">
@@ -14,7 +8,6 @@
 		<c:forEach var="option" items="${optionList}" varStatus="status">
 			<table id="option-table-${status.index}" data-id="${status.index}">
 				<tr>
-				
 					<td>
 						<span>${status.index+1}</span>
 					</td>
@@ -53,5 +46,4 @@
 			</table>
 		</c:forEach>
 	</div>
-
-</div>
\ No newline at end of file
+</div>
Index: lams_tool_assessment/web/pages/authoring/parts/orderingoption.jsp
===================================================================
diff -u -r67d7232f087b9f5c72ff41f7bbebe29cff81e099 -r8a65083cf102509e0ca486f636746f56a600c514
--- lams_tool_assessment/web/pages/authoring/parts/orderingoption.jsp	(.../orderingoption.jsp)	(revision 67d7232f087b9f5c72ff41f7bbebe29cff81e099)
+++ lams_tool_assessment/web/pages/authoring/parts/orderingoption.jsp	(.../orderingoption.jsp)	(revision 8a65083cf102509e0ca486f636746f56a600c514)
@@ -1,10 +1,8 @@
 <input type="hidden" name="optionSequenceId${status.index}" value="${option.sequenceId}">
 <input type="hidden" name="optionUid${status.index}" value="${option.uid}">
 
-<div class="form-group">
-	<label for="optionString${status.index}">
-		<fmt:message key="label.authoring.basic.option.answer"/>&nbsp;${status.index+1}
-	</label>
-		            	
-	<lams:CKEditor id="optionString${status.index}" value="${option.optionString}" contentFolderID="${contentFolderID}"/>
+<div class="form-group option-ckeditor">
+	<c:set var="OPTION_ANSWER_LABEL"><fmt:message key="label.authoring.basic.option.answer"/></c:set>      	
+	<lams:CKEditor id="optionString${status.index}" value="${option.optionString}" contentFolderID="${contentFolderID}"
+		placeholder="${OPTION_ANSWER_LABEL}&thinsp; ${status.index+1}" height="50px"/>
 </div>
Index: lams_tool_assessment/web/pages/authoring/parts/shortansweroption.jsp
===================================================================
diff -u -r67d7232f087b9f5c72ff41f7bbebe29cff81e099 -r8a65083cf102509e0ca486f636746f56a600c514
--- lams_tool_assessment/web/pages/authoring/parts/shortansweroption.jsp	(.../shortansweroption.jsp)	(revision 67d7232f087b9f5c72ff41f7bbebe29cff81e099)
+++ lams_tool_assessment/web/pages/authoring/parts/shortansweroption.jsp	(.../shortansweroption.jsp)	(revision 8a65083cf102509e0ca486f636746f56a600c514)
@@ -2,24 +2,18 @@
 <input type="hidden" name="optionUid${status.index}" value="${option.uid}">
 
 <div class="form-group">
-	<label for="optionString${status.index}">
-		<fmt:message key="label.authoring.basic.option.answer"/>&nbsp;${status.index+1}
-	</label>
-	<input type="text" name="optionString${status.index}" value="<c:out value='${option.optionString}' />" class="form-control input-sm"/>
+	<c:set var="OPTION_LABEL"><fmt:message key="label.authoring.basic.option.answer"/></c:set>
+	<input type="text" name="optionString${status.index}" class="borderless-text-input"
+		value="<c:out value='${option.optionString}' />" placeholder="${OPTION_LABEL}&thinsp; ${status.index+1}"/>
 </div>
 
-<div class="form-group form-inline">
-	<label>
-		<fmt:message key="label.authoring.basic.option.grade"></fmt:message>:
-	</label>
+<div class="settings-on-hover-hidden">
 	<%@ include file="gradeselector.jsp"%>
+	
+	<div class="voffset5-bottom">
+	   	<c:set var="FEEDBACK_LABEL"><fmt:message key="label.authoring.basic.option.feedback"/></c:set>
+	   	<lams:CKEditor id="optionFeedback${status.index}" value="${option.feedback}" 
+	     	placeholder="${FEEDBACK_LABEL}" contentFolderID="${contentFolderID}" height="50px"/>
+	</div>
 </div>
 
-<div class="form-group">
-    <label for="optionFeedback${status.index}">
-    	<a data-toggle="collapse" data-target="#feedback${status.index}" href="#fback${status.index}"><i class="fa fa-xs fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.authoring.basic.option.feedback"/></a>
-    </label>
-    <div id="feedback${status.index}" class="collapse <c:if test="${not empty option.feedback}">in</c:if>">
-    	<lams:CKEditor id="optionFeedback${status.index}" value="${option.feedback}" contentFolderID="${contentFolderID}"/>
-    </div>	
-</div>