diff --git a/app/assets/images/images/back_disabled.png b/app/assets/images/images/back_disabled.png deleted file mode 100644 index 881de797..00000000 Binary files a/app/assets/images/images/back_disabled.png and /dev/null differ diff --git a/app/assets/images/images/back_enabled.png b/app/assets/images/images/back_enabled.png deleted file mode 100644 index c608682b..00000000 Binary files a/app/assets/images/images/back_enabled.png and /dev/null differ diff --git a/app/assets/images/images/back_enabled_hover.png b/app/assets/images/images/back_enabled_hover.png deleted file mode 100644 index d300f106..00000000 Binary files a/app/assets/images/images/back_enabled_hover.png and /dev/null differ diff --git a/app/assets/images/images/forward_disabled.png b/app/assets/images/images/forward_disabled.png deleted file mode 100644 index 6a6ded7d..00000000 Binary files a/app/assets/images/images/forward_disabled.png and /dev/null differ diff --git a/app/assets/images/images/forward_enabled.png b/app/assets/images/images/forward_enabled.png deleted file mode 100644 index a4e6b538..00000000 Binary files a/app/assets/images/images/forward_enabled.png and /dev/null differ diff --git a/app/assets/images/images/forward_enabled_hover.png b/app/assets/images/images/forward_enabled_hover.png deleted file mode 100644 index fc46c5eb..00000000 Binary files a/app/assets/images/images/forward_enabled_hover.png and /dev/null differ diff --git a/app/assets/images/images/sort_asc.png b/app/assets/images/images/sort_asc.png deleted file mode 100644 index a88d7975..00000000 Binary files a/app/assets/images/images/sort_asc.png and /dev/null differ diff --git a/app/assets/images/images/sort_asc_disabled.png b/app/assets/images/images/sort_asc_disabled.png deleted file mode 100644 index 4e144cf0..00000000 Binary files a/app/assets/images/images/sort_asc_disabled.png and /dev/null differ diff --git a/app/assets/images/images/sort_both.png b/app/assets/images/images/sort_both.png deleted file mode 100644 index 18670406..00000000 Binary files a/app/assets/images/images/sort_both.png and /dev/null differ diff --git a/app/assets/images/images/sort_desc.png b/app/assets/images/images/sort_desc.png deleted file mode 100644 index def071ed..00000000 Binary files a/app/assets/images/images/sort_desc.png and /dev/null differ diff --git a/app/assets/images/images/sort_desc_disabled.png b/app/assets/images/images/sort_desc_disabled.png deleted file mode 100644 index 7824973c..00000000 Binary files a/app/assets/images/images/sort_desc_disabled.png and /dev/null differ diff --git a/app/assets/images/images/ui-bg_glass_55_fcf0ba_1x400.png b/app/assets/images/images/ui-bg_glass_55_fcf0ba_1x400.png deleted file mode 100644 index a95fa334..00000000 Binary files a/app/assets/images/images/ui-bg_glass_55_fcf0ba_1x400.png and /dev/null differ diff --git a/app/assets/images/images/ui-bg_gloss-wave_100_ece8da_500x100.png b/app/assets/images/images/ui-bg_gloss-wave_100_ece8da_500x100.png deleted file mode 100644 index 6a02e8e6..00000000 Binary files a/app/assets/images/images/ui-bg_gloss-wave_100_ece8da_500x100.png and /dev/null differ diff --git a/app/assets/images/images/ui-bg_highlight-hard_100_f5f3e5_1x100.png b/app/assets/images/images/ui-bg_highlight-hard_100_f5f3e5_1x100.png deleted file mode 100644 index 6045f63e..00000000 Binary files a/app/assets/images/images/ui-bg_highlight-hard_100_f5f3e5_1x100.png and /dev/null differ diff --git a/app/assets/images/images/ui-bg_highlight-hard_100_fafaf4_1x100.png b/app/assets/images/images/ui-bg_highlight-hard_100_fafaf4_1x100.png deleted file mode 100644 index bfc39c67..00000000 Binary files a/app/assets/images/images/ui-bg_highlight-hard_100_fafaf4_1x100.png and /dev/null differ diff --git a/app/assets/images/images/ui-bg_highlight-hard_15_459e00_1x100.png b/app/assets/images/images/ui-bg_highlight-hard_15_459e00_1x100.png deleted file mode 100644 index 677a9020..00000000 Binary files a/app/assets/images/images/ui-bg_highlight-hard_15_459e00_1x100.png and /dev/null differ diff --git a/app/assets/images/images/ui-bg_highlight-hard_95_cccccc_1x100.png b/app/assets/images/images/ui-bg_highlight-hard_95_cccccc_1x100.png deleted file mode 100644 index ca80bffc..00000000 Binary files a/app/assets/images/images/ui-bg_highlight-hard_95_cccccc_1x100.png and /dev/null differ diff --git a/app/assets/images/images/ui-bg_highlight-soft_25_67b021_1x100.png b/app/assets/images/images/ui-bg_highlight-soft_25_67b021_1x100.png deleted file mode 100644 index 51773351..00000000 Binary files a/app/assets/images/images/ui-bg_highlight-soft_25_67b021_1x100.png and /dev/null differ diff --git a/app/assets/images/images/ui-bg_highlight-soft_95_ffedad_1x100.png b/app/assets/images/images/ui-bg_highlight-soft_95_ffedad_1x100.png deleted file mode 100644 index 12686a5a..00000000 Binary files a/app/assets/images/images/ui-bg_highlight-soft_95_ffedad_1x100.png and /dev/null differ diff --git a/app/assets/images/images/ui-bg_inset-soft_15_2b2922_1x100.png b/app/assets/images/images/ui-bg_inset-soft_15_2b2922_1x100.png deleted file mode 100644 index 8568394c..00000000 Binary files a/app/assets/images/images/ui-bg_inset-soft_15_2b2922_1x100.png and /dev/null differ diff --git a/app/assets/images/images/ui-icons_808080_256x240.png b/app/assets/images/images/ui-icons_808080_256x240.png deleted file mode 100644 index 69ba6d81..00000000 Binary files a/app/assets/images/images/ui-icons_808080_256x240.png and /dev/null differ diff --git a/app/assets/images/images/ui-icons_847e71_256x240.png b/app/assets/images/images/ui-icons_847e71_256x240.png deleted file mode 100644 index b20c3220..00000000 Binary files a/app/assets/images/images/ui-icons_847e71_256x240.png and /dev/null differ diff --git a/app/assets/images/images/ui-icons_8DC262_256x240.png b/app/assets/images/images/ui-icons_8DC262_256x240.png deleted file mode 100644 index 00429575..00000000 Binary files a/app/assets/images/images/ui-icons_8DC262_256x240.png and /dev/null differ diff --git a/app/assets/images/images/ui-icons_cd0a0a_256x240.png b/app/assets/images/images/ui-icons_cd0a0a_256x240.png deleted file mode 100644 index 2ab019b7..00000000 Binary files a/app/assets/images/images/ui-icons_cd0a0a_256x240.png and /dev/null differ diff --git a/app/assets/images/images/ui-icons_eeeeee_256x240.png b/app/assets/images/images/ui-icons_eeeeee_256x240.png deleted file mode 100644 index 01bb36ba..00000000 Binary files a/app/assets/images/images/ui-icons_eeeeee_256x240.png and /dev/null differ diff --git a/app/assets/images/images/ui-icons_ffffff_256x240.png b/app/assets/images/images/ui-icons_ffffff_256x240.png deleted file mode 100644 index 42f8f992..00000000 Binary files a/app/assets/images/images/ui-icons_ffffff_256x240.png and /dev/null differ diff --git a/app/assets/javascripts/osem.js b/app/assets/javascripts/osem.js index c0cc7101..08c8e743 100644 --- a/app/assets/javascripts/osem.js +++ b/app/assets/javascripts/osem.js @@ -179,167 +179,6 @@ $( document ).ready(function() { } ); }); -/* Set the defaults for DataTables initialisation */ -$.extend( true, $.fn.dataTable.defaults, { - "sDom": "<'row-fluid'<'span6'l><'span6'f>r>t<'row-fluid'<'span6'i><'span6'p>>", - "sPaginationType": "bootstrap", - "oLanguage": { - "sLengthMenu": "_MENU_ items per page" - } -} ); - -/* Default class modification */ -$.extend( $.fn.dataTableExt.oStdClasses, { - "sWrapper": "dataTables_wrapper form-inline" -} ); - -/* API method to get paging information */ -$.fn.dataTableExt.oApi.fnPagingInfo = function ( oSettings ) -{ - return { - "iStart": oSettings._iDisplayStart, - "iEnd": oSettings.fnDisplayEnd(), - "iLength": oSettings._iDisplayLength, - "iTotal": oSettings.fnRecordsTotal(), - "iFilteredTotal": oSettings.fnRecordsDisplay(), - "iPage": oSettings._iDisplayLength === -1 ? - 0 : Math.ceil( oSettings._iDisplayStart / oSettings._iDisplayLength ), - "iTotalPages": oSettings._iDisplayLength === -1 ? - 0 : Math.ceil( oSettings.fnRecordsDisplay() / oSettings._iDisplayLength ) - }; -}; - -$.fn.dataTableExt.oApi.fnReloadAjax = function ( oSettings, sNewSource, fnCallback, bStandingRedraw ) -{ - if ( typeof sNewSource != 'undefined' && sNewSource != null ) { - oSettings.sAjaxSource = sNewSource; - } - - // Server-side processing should just call fnDraw - if ( oSettings.oFeatures.bServerSide ) { - this.fnDraw(); - return; - } - - this.oApi._fnProcessingDisplay( oSettings, true ); - var that = this; - var iStart = oSettings._iDisplayStart; - var aData = []; - - this.oApi._fnServerParams( oSettings, aData ); - - oSettings.fnServerData.call( oSettings.oInstance, oSettings.sAjaxSource, aData, function(json) { - /* Clear the old information from the table */ - that.oApi._fnClearTable( oSettings ); - - /* Got the data - add it to the table */ - var aData = (oSettings.sAjaxDataProp !== "") ? - that.oApi._fnGetObjectDataFn( oSettings.sAjaxDataProp )( json ) : json; - - for ( var i=0 ; i'+ - ''+ - ''+ - '' - ); - var els = $('a', nPaging); - $(els[0]).bind( 'click.DT', { action: "previous" }, fnClickHandler ); - $(els[1]).bind( 'click.DT', { action: "next" }, fnClickHandler ); - }, - - "fnUpdate": function ( oSettings, fnDraw ) { - var iListLength = 5; - var oPaging = oSettings.oInstance.fnPagingInfo(); - var an = oSettings.aanFeatures.p; - var i, ien, j, sClass, iStart, iEnd, iHalf=Math.floor(iListLength/2); - - if ( oPaging.iTotalPages < iListLength) { - iStart = 1; - iEnd = oPaging.iTotalPages; - } - else if ( oPaging.iPage <= iHalf ) { - iStart = 1; - iEnd = iListLength; - } else if ( oPaging.iPage >= (oPaging.iTotalPages-iHalf) ) { - iStart = oPaging.iTotalPages - iListLength + 1; - iEnd = oPaging.iTotalPages; - } else { - iStart = oPaging.iPage - iHalf + 1; - iEnd = iStart + iListLength - 1; - } - - for ( i=0, ien=an.length ; i'+j+'') - .insertBefore( $('li:last', an[i])[0] ) - .bind('click', function (e) { - e.preventDefault(); - oSettings._iDisplayStart = (parseInt($('a', this).text(),10)-1) * oPaging.iLength; - fnDraw( oSettings ); - } ); - } - - // Add / remove disabled classes from the static elements - if ( oPaging.iPage === 0 ) { - $('li:first', an[i]).addClass('disabled'); - } else { - $('li:first', an[i]).removeClass('disabled'); - } - - if ( oPaging.iPage === oPaging.iTotalPages-1 || oPaging.iTotalPages === 0 ) { - $('li:last', an[i]).addClass('disabled'); - } else { - $('li:last', an[i]).removeClass('disabled'); - } - } - } - } -} ); - /* Commodity function for modal windows */ window.build_dialog = function(selector, content) { diff --git a/app/models/datatable.rb b/app/models/datatable.rb deleted file mode 100644 index 03ec9038..00000000 --- a/app/models/datatable.rb +++ /dev/null @@ -1,98 +0,0 @@ -# derived from http://railscasts.com/episodes/340-datatables -# handles server side multi-column searching and sorting - -class Datatable - delegate :params, :h, :raw, :link_to, :number_to_currency, to: :@view - - def initialize(klass, view) - @klass = klass - @view = view - end - - def as_json - { - sEcho: params[:sEcho].to_i, - iTotalRecords: @klass.count, - iTotalDisplayRecords: items.total_entries, - aaData: data - } - end - - def data - [] - end - - def columns - [] - end - - private - - def items - @items ||= fetch_items - end - - def fetch_items - items = filtered_list - items = selected_columns(items) - items = items.order(sort_order) - items = items.page(page).per_page(per_page) - if params[:sSearch].present? - items = items.where(quick_search) - end - items - end - - def filtered_list - @klass.scoped - end - - def selected_columns items - items - end - - def quick_search - search_for = params[:sSearch].split(' ') - terms = {} - which_one = -1 - criteria = search_for.inject([]) do |mem, atom| - which_one += 1 - terms["search#{which_one}".to_sym] = "%#{atom}%" - mem << "(#{search_cols.map{|col| "#{col} like :search#{which_one}"}.join(' or ')})" - end.join(' and ') - [criteria, terms] - end - - def page - params[:iDisplayStart].to_i/per_page + 1 - end - - def per_page - params[:iDisplayLength].to_i > 0 ? params[:iDisplayLength].to_i : 10 - end - - def sort_order - colnum = 0 - sort_by = [] - while true - break if !sorted?(colnum) - sort_by << "#{sort_column(colnum)} #{sort_direction(colnum)}" - colnum += 1 - end - sort_by.join(', ') - end - - def sorted? index=0 - !params["iSortCol_#{index}"].nil? - end - - def sort_column index=0 - index = "iSortCol_#{index}" - columns[params[index].to_i] - end - - def sort_direction index=0 - index = "sSortDir_#{index}" - params[index] == 'desc' ? 'desc' : 'asc' - end -end