+ * and Kris Kowal ',
+ '',
+ '',
+ '',
+ '<%=prev%> <%=next%> ',
+ '',
+ '<%=week%> <%=day1%> <%=day2%> <%=day3%> <%=day4%> <%=day5%> <%=day6%> <%=day7%> ',
+ ' ',
+ '
'
+ ],
+ space : '
',
+ '',
+ '<%=weeks[0].week%> <%=weeks[0].days[0].text%> <%=weeks[0].days[1].text%> <%=weeks[0].days[2].text%> <%=weeks[0].days[3].text%> <%=weeks[0].days[4].text%> <%=weeks[0].days[5].text%> <%=weeks[0].days[6].text%> ',
+ '',
+ '<%=weeks[1].week%> <%=weeks[1].days[0].text%> <%=weeks[1].days[1].text%> <%=weeks[1].days[2].text%> <%=weeks[1].days[3].text%> <%=weeks[1].days[4].text%> <%=weeks[1].days[5].text%> <%=weeks[1].days[6].text%> ',
+ '',
+ '<%=weeks[2].week%> <%=weeks[2].days[0].text%> <%=weeks[2].days[1].text%> <%=weeks[2].days[2].text%> <%=weeks[2].days[3].text%> <%=weeks[2].days[4].text%> <%=weeks[2].days[5].text%> <%=weeks[2].days[6].text%> ',
+ '',
+ '<%=weeks[3].week%> <%=weeks[3].days[0].text%> <%=weeks[3].days[1].text%> <%=weeks[3].days[2].text%> <%=weeks[3].days[3].text%> <%=weeks[3].days[4].text%> <%=weeks[3].days[5].text%> <%=weeks[3].days[6].text%> ',
+ '',
+ '<%=weeks[4].week%> <%=weeks[4].days[0].text%> <%=weeks[4].days[1].text%> <%=weeks[4].days[2].text%> <%=weeks[4].days[3].text%> <%=weeks[4].days[4].text%> <%=weeks[4].days[5].text%> <%=weeks[4].days[6].text%> ',
+ '',
+ '<%=weeks[5].week%> <%=weeks[5].days[0].text%> <%=weeks[5].days[1].text%> <%=weeks[5].days[2].text%> <%=weeks[5].days[3].text%> <%=weeks[5].days[4].text%> <%=weeks[5].days[5].text%> <%=weeks[5].days[6].text%> ',
+ ' '
+ ],
+ months: [
+ '',
+ '',
+ '<%=data[0]%> <%=data[1]%> <%=data[2]%> <%=data[3]%> ',
+ '',
+ '<%=data[4]%> <%=data[5]%> <%=data[6]%> <%=data[7]%> ',
+ '',
+ '<%=data[8]%> <%=data[9]%> <%=data[10]%> <%=data[11]%> ',
+ ' '
+ ]
+ },
+ defaults = {
+ flat: false,
+ starts: 1,
+ prev: '◀',
+ next: '▶',
+ lastSel: false,
+ mode: 'single',
+ view: 'days',
+ calendars: 1,
+ format: 'Y-m-d',
+ position: 'bottom',
+ eventName: 'click',
+ onRender: function(){return {};},
+ onChange: function(){return true;},
+ onShow: function(){return true;},
+ onBeforeShow: function(){return true;},
+ onHide: function(){return true;},
+ locale: {
+ days: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"],
+ daysShort: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"],
+ daysMin: ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"],
+ months: ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"],
+ monthsShort: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
+ weekMin: 'wk'
+ }
+ },
+ fill = function(el) {
+ var options = $(el).data('datepicker');
+ var cal = $(el);
+ var currentCal = Math.floor(options.calendars/2), date, data, dow, month, cnt = 0, week, days, indic, indic2, html, tblCal;
+ cal.find('td>table tbody').remove();
+ for (var i = 0; i < options.calendars; i++) {
+ date = new Date(options.current);
+ date.addMonths(-currentCal + i);
+ tblCal = cal.find('table').eq(i+1);
+ switch (tblCal[0].className) {
+ case 'datepickerViewDays':
+ dow = formatDate(date, 'B, Y');
+ break;
+ case 'datepickerViewMonths':
+ dow = date.getFullYear();
+ break;
+ case 'datepickerViewYears':
+ dow = (date.getFullYear()-6) + ' - ' + (date.getFullYear()+5);
+ break;
+ }
+ tblCal.find('thead tr:first th:eq(1) span').text(dow);
+ dow = date.getFullYear()-6;
+ data = {
+ data: [],
+ className: 'datepickerYears'
+ }
+ for ( var j = 0; j < 12; j++) {
+ data.data.push(dow + j);
+ }
+ html = tmpl(tpl.months.join(''), data);
+ date.setDate(1);
+ data = {weeks:[], test: 10};
+ month = date.getMonth();
+ var dow = (date.getDay() - options.starts) % 7;
+ date.addDays(-(dow + (dow < 0 ? 7 : 0)));
+ week = -1;
+ cnt = 0;
+ while (cnt < 42) {
+ indic = parseInt(cnt/7,10);
+ indic2 = cnt%7;
+ if (!data.weeks[indic]) {
+ week = date.getWeekNumber();
+ data.weeks[indic] = {
+ week: week,
+ days: []
+ };
+ }
+ data.weeks[indic].days[indic2] = {
+ text: date.getDate(),
+ classname: []
+ };
+ if (month != date.getMonth()) {
+ data.weeks[indic].days[indic2].classname.push('datepickerNotInMonth');
+ }
+ if (date.getDay() == 0) {
+ data.weeks[indic].days[indic2].classname.push('datepickerSunday');
+ }
+ if (date.getDay() == 6) {
+ data.weeks[indic].days[indic2].classname.push('datepickerSaturday');
+ }
+ var fromUser = options.onRender(date);
+ var val = date.valueOf();
+ if (fromUser.selected || options.date == val || $.inArray(val, options.date) > -1 || (options.mode == 'range' && val >= options.date[0] && val <= options.date[1])) {
+ data.weeks[indic].days[indic2].classname.push('datepickerSelected');
+ }
+ if (fromUser.disabled) {
+ data.weeks[indic].days[indic2].classname.push('datepickerDisabled');
+ }
+ if (fromUser.className) {
+ data.weeks[indic].days[indic2].classname.push(fromUser.className);
+ }
+ data.weeks[indic].days[indic2].classname = data.weeks[indic].days[indic2].classname.join(' ');
+ cnt++;
+ date.addDays(1);
+ }
+ html = tmpl(tpl.days.join(''), data) + html;
+ data = {
+ data: options.locale.monthsShort,
+ className: 'datepickerMonths'
+ };
+ html = tmpl(tpl.months.join(''), data) + html;
+ tblCal.append(html);
+ }
+ },
+ parseDate = function (date, format) {
+ if (date.constructor == Date) {
+ return new Date(date);
+ }
+ var parts = date.split(/\W+/);
+ var against = format.split(/\W+/), d, m, y, h, min, now = new Date();
+ for (var i = 0; i < parts.length; i++) {
+ switch (against[i]) {
+ case 'd':
+ case 'e':
+ d = parseInt(parts[i],10);
+ break;
+ case 'm':
+ m = parseInt(parts[i], 10)-1;
+ break;
+ case 'Y':
+ case 'y':
+ y = parseInt(parts[i], 10);
+ y += y > 100 ? 0 : (y < 29 ? 2000 : 1900);
+ break;
+ case 'H':
+ case 'I':
+ case 'k':
+ case 'l':
+ h = parseInt(parts[i], 10);
+ break;
+ case 'P':
+ case 'p':
+ if (/pm/i.test(parts[i]) && h < 12) {
+ h += 12;
+ } else if (/am/i.test(parts[i]) && h >= 12) {
+ h -= 12;
+ }
+ break;
+ case 'M':
+ min = parseInt(parts[i], 10);
+ break;
+ }
+ }
+ return new Date(
+ y === undefined ? now.getFullYear() : y,
+ m === undefined ? now.getMonth() : m,
+ d === undefined ? now.getDate() : d,
+ h === undefined ? now.getHours() : h,
+ min === undefined ? now.getMinutes() : min,
+ 0
+ );
+ },
+ formatDate = function(date, format) {
+ var m = date.getMonth();
+ var d = date.getDate();
+ var y = date.getFullYear();
+ var wn = date.getWeekNumber();
+ var w = date.getDay();
+ var s = {};
+ var hr = date.getHours();
+ var pm = (hr >= 12);
+ var ir = (pm) ? (hr - 12) : hr;
+ var dy = date.getDayOfYear();
+ if (ir == 0) {
+ ir = 12;
+ }
+ var min = date.getMinutes();
+ var sec = date.getSeconds();
+ var parts = format.split(''), part;
+ for ( var i = 0; i < parts.length; i++ ) {
+ part = parts[i];
+ switch (parts[i]) {
+ case 'a':
+ part = date.getDayName();
+ break;
+ case 'A':
+ part = date.getDayName(true);
+ break;
+ case 'b':
+ part = date.getMonthName();
+ break;
+ case 'B':
+ part = date.getMonthName(true);
+ break;
+ case 'C':
+ part = 1 + Math.floor(y / 100);
+ break;
+ case 'd':
+ part = (d < 10) ? ("0" + d) : d;
+ break;
+ case 'e':
+ part = d;
+ break;
+ case 'H':
+ part = (hr < 10) ? ("0" + hr) : hr;
+ break;
+ case 'I':
+ part = (ir < 10) ? ("0" + ir) : ir;
+ break;
+ case 'j':
+ part = (dy < 100) ? ((dy < 10) ? ("00" + dy) : ("0" + dy)) : dy;
+ break;
+ case 'k':
+ part = hr;
+ break;
+ case 'l':
+ part = ir;
+ break;
+ case 'm':
+ part = (m < 9) ? ("0" + (1+m)) : (1+m);
+ break;
+ case 'M':
+ part = (min < 10) ? ("0" + min) : min;
+ break;
+ case 'p':
+ case 'P':
+ part = pm ? "PM" : "AM";
+ break;
+ case 's':
+ part = Math.floor(date.getTime() / 1000);
+ break;
+ case 'S':
+ part = (sec < 10) ? ("0" + sec) : sec;
+ break;
+ case 'u':
+ part = w + 1;
+ break;
+ case 'w':
+ part = w;
+ break;
+ case 'y':
+ part = ('' + y).substr(2, 2);
+ break;
+ case 'Y':
+ part = y;
+ break;
+ }
+ parts[i] = part;
+ }
+ return parts.join('');
+ },
+ extendDate = function(options) {
+ if (Date.prototype.tempDate) {
+ return;
+ }
+ Date.prototype.tempDate = null;
+ Date.prototype.months = options.months;
+ Date.prototype.monthsShort = options.monthsShort;
+ Date.prototype.days = options.days;
+ Date.prototype.daysShort = options.daysShort;
+ Date.prototype.getMonthName = function(fullName) {
+ return this[fullName ? 'months' : 'monthsShort'][this.getMonth()];
+ };
+ Date.prototype.getDayName = function(fullName) {
+ return this[fullName ? 'days' : 'daysShort'][this.getDay()];
+ };
+ Date.prototype.addDays = function (n) {
+ this.setDate(this.getDate() + n);
+ this.tempDate = this.getDate();
+ };
+ Date.prototype.addMonths = function (n) {
+ if (this.tempDate == null) {
+ this.tempDate = this.getDate();
+ }
+ this.setDate(1);
+ this.setMonth(this.getMonth() + n);
+ this.setDate(Math.min(this.tempDate, this.getMaxDays()));
+ };
+ Date.prototype.addYears = function (n) {
+ if (this.tempDate == null) {
+ this.tempDate = this.getDate();
+ }
+ this.setDate(1);
+ this.setFullYear(this.getFullYear() + n);
+ this.setDate(Math.min(this.tempDate, this.getMaxDays()));
+ };
+ Date.prototype.getMaxDays = function() {
+ var tmpDate = new Date(Date.parse(this)),
+ d = 28, m;
+ m = tmpDate.getMonth();
+ d = 28;
+ while (tmpDate.getMonth() == m) {
+ d ++;
+ tmpDate.setDate(d);
+ }
+ return d - 1;
+ };
+ Date.prototype.getFirstDay = function() {
+ var tmpDate = new Date(Date.parse(this));
+ tmpDate.setDate(1);
+ return tmpDate.getDay();
+ };
+ Date.prototype.getWeekNumber = function() {
+ var tempDate = new Date(this);
+ tempDate.setDate(tempDate.getDate() - (tempDate.getDay() + 6) % 7 + 3);
+ var dms = tempDate.valueOf();
+ tempDate.setMonth(0);
+ tempDate.setDate(4);
+ return Math.round((dms - tempDate.valueOf()) / (604800000)) + 1;
+ };
+ Date.prototype.getDayOfYear = function() {
+ var now = new Date(this.getFullYear(), this.getMonth(), this.getDate(), 0, 0, 0);
+ var then = new Date(this.getFullYear(), 0, 0, 0, 0, 0);
+ var time = now - then;
+ return Math.floor(time / 24*60*60*1000);
+ };
+ },
+ layout = function (el) {
+ var options = $(el).data('datepicker');
+ var cal = $('#' + options.id);
+ if (!options.extraHeight) {
+ var divs = $(el).find('div');
+ //options.extraHeight = divs.get(0).offsetHeight + divs.get(1).offsetHeight;
+ //options.extraWidth = divs.get(2).offsetWidth + divs.get(3).offsetWidth;
+ }
+ var tbl = cal.find('table:first').get(0);
+ var width = tbl.offsetWidth;
+ var height = tbl.offsetHeight;
+ cal.css({
+ width: width + options.extraWidth + 'px',
+ height: height + options.extraHeight + 'px'
+ }).find('div.datepickerContainer').css({
+ width: width + 'px',
+ height: height + 'px'
+ });
+ },
+ click = function(ev) {
+ if ($(ev.target).is('span')) {
+ ev.target = ev.target.parentNode;
+ }
+ var el = $(ev.target);
+ if (el.is('a')) {
+ ev.target.blur();
+ if (el.hasClass('datepickerDisabled')) {
+ return false;
+ }
+ var options = $(this).data('datepicker');
+ var parentEl = el.parent();
+ var tblEl = parentEl.parent().parent().parent();
+ var tblIndex = $('table', this).index(tblEl.get(0)) - 1;
+ var tmp = new Date(options.current);
+ var changed = false;
+ var fillIt = false;
+ if (parentEl.is('th')) {
+ if (parentEl.hasClass('datepickerWeek') && options.mode == 'range' && !parentEl.next().hasClass('datepickerDisabled')) {
+ var val = parseInt(parentEl.next().text(), 10);
+ tmp.addMonths(tblIndex - Math.floor(options.calendars/2));
+ if (parentEl.next().hasClass('datepickerNotInMonth')) {
+ tmp.addMonths(val > 15 ? -1 : 1);
+ }
+ tmp.setDate(val);
+ options.date[0] = (tmp.setHours(0,0,0,0)).valueOf();
+ tmp.setHours(23,59,59,0);
+ tmp.addDays(6);
+ options.date[1] = tmp.valueOf();
+ fillIt = true;
+ changed = true;
+ options.lastSel = false;
+ } else if (parentEl.hasClass('datepickerMonth')) {
+ tmp.addMonths(tblIndex - Math.floor(options.calendars/2));
+ switch (tblEl.get(0).className) {
+ case 'datepickerViewDays':
+ tblEl.get(0).className = 'datepickerViewMonths';
+ el.find('span').text(tmp.getFullYear());
+ break;
+ case 'datepickerViewMonths':
+ tblEl.get(0).className = 'datepickerViewYears';
+ el.find('span').text((tmp.getFullYear()-6) + ' - ' + (tmp.getFullYear()+5));
+ break;
+ case 'datepickerViewYears':
+ tblEl.get(0).className = 'datepickerViewDays';
+ el.find('span').text(formatDate(tmp, 'B, Y'));
+ break;
+ }
+ } else if (parentEl.parent().parent().is('thead')) {
+ switch (tblEl.get(0).className) {
+ case 'datepickerViewDays':
+ options.current.addMonths(parentEl.hasClass('datepickerGoPrev') ? -1 : 1);
+ break;
+ case 'datepickerViewMonths':
+ options.current.addYears(parentEl.hasClass('datepickerGoPrev') ? -1 : 1);
+ break;
+ case 'datepickerViewYears':
+ options.current.addYears(parentEl.hasClass('datepickerGoPrev') ? -12 : 12);
+ break;
+ }
+ fillIt = true;
+ }
+ } else if (parentEl.is('td') && !parentEl.hasClass('datepickerDisabled')) {
+ switch (tblEl.get(0).className) {
+ case 'datepickerViewMonths':
+ options.current.setMonth(tblEl.find('tbody.datepickerMonths td').index(parentEl));
+ options.current.setFullYear(parseInt(tblEl.find('thead th.datepickerMonth span').text(), 10));
+ options.current.addMonths(Math.floor(options.calendars/2) - tblIndex);
+ tblEl.get(0).className = 'datepickerViewDays';
+ break;
+ case 'datepickerViewYears':
+ options.current.setFullYear(parseInt(el.text(), 10));
+ tblEl.get(0).className = 'datepickerViewMonths';
+ break;
+ default:
+ var val = parseInt(el.text(), 10);
+ tmp.addMonths(tblIndex - Math.floor(options.calendars/2));
+ if (parentEl.hasClass('datepickerNotInMonth')) {
+ tmp.addMonths(val > 15 ? -1 : 1);
+ }
+ tmp.setDate(val);
+ switch (options.mode) {
+ case 'multiple':
+ val = (tmp.setHours(0,0,0,0)).valueOf();
+ if ($.inArray(val, options.date) > -1) {
+ $.each(options.date, function(nr, dat){
+ if (dat == val) {
+ options.date.splice(nr,1);
+ return false;
+ }
+ });
+ } else {
+ options.date.push(val);
+ }
+ break;
+ case 'range':
+ if (!options.lastSel) {
+ options.date[0] = (tmp.setHours(0,0,0,0)).valueOf();
+ }
+ val = (tmp.setHours(23,59,59,0)).valueOf();
+ if (val < options.date[0]) {
+ options.date[1] = options.date[0] + 86399000;
+ options.date[0] = val - 86399000;
+ } else {
+ options.date[1] = val;
+ }
+ options.lastSel = !options.lastSel;
+ break;
+ default:
+ options.date = tmp.valueOf();
+ break;
+ }
+ break;
+ }
+ fillIt = true;
+ changed = true;
+ }
+ if (fillIt) {
+ fill(this);
+ }
+ if (changed) {
+ options.onChange.apply(this, prepareDate(options));
+ }
+ }
+ return false;
+ },
+ prepareDate = function (options) {
+ var tmp;
+ if (options.mode == 'single') {
+ tmp = new Date(options.date);
+ return [formatDate(tmp, options.format), tmp, options.el];
+ } else {
+ tmp = [[],[], options.el];
+ $.each(options.date, function(nr, val){
+ var date = new Date(val);
+ tmp[0].push(formatDate(date, options.format));
+ tmp[1].push(date);
+ });
+ return tmp;
+ }
+ },
+ getViewport = function () {
+ var m = document.compatMode == 'CSS1Compat';
+ return {
+ l : window.pageXOffset || (m ? document.documentElement.scrollLeft : document.body.scrollLeft),
+ t : window.pageYOffset || (m ? document.documentElement.scrollTop : document.body.scrollTop),
+ w : window.innerWidth || (m ? document.documentElement.clientWidth : document.body.clientWidth),
+ h : window.innerHeight || (m ? document.documentElement.clientHeight : document.body.clientHeight)
+ };
+ },
+ isChildOf = function(parentEl, el, container) {
+ if (parentEl == el) {
+ return true;
+ }
+ if (parentEl.contains) {
+ return parentEl.contains(el);
+ }
+ if ( parentEl.compareDocumentPosition ) {
+ return !!(parentEl.compareDocumentPosition(el) & 16);
+ }
+ var prEl = el.parentNode;
+ while(prEl && prEl != container) {
+ if (prEl == parentEl)
+ return true;
+ prEl = prEl.parentNode;
+ }
+ return false;
+ },
+ show = function (ev) {
+ var cal = $('#' + $(this).data('datepickerId'));
+ if (!cal.is(':visible')) {
+ var calEl = cal.get(0);
+ fill(calEl);
+ var options = cal.data('datepicker');
+ options.onBeforeShow.apply(this, [cal.get(0)]);
+ var pos = $(this).offset();
+ var viewPort = getViewport();
+ var top = pos.top;
+ var left = pos.left;
+ var oldDisplay = $.curCSS(calEl, 'display');
+ cal.css({
+ visibility: 'hidden',
+ display: 'block'
+ });
+ layout(calEl);
+ switch (options.position){
+ case 'top':
+ top -= calEl.offsetHeight;
+ break;
+ case 'left':
+ left -= calEl.offsetWidth;
+ break;
+ case 'right':
+ left += this.offsetWidth;
+ break;
+ case 'bottom':
+ top += this.offsetHeight;
+ break;
+ }
+ if (top + calEl.offsetHeight > viewPort.t + viewPort.h) {
+ top = pos.top - calEl.offsetHeight;
+ }
+ if (top < viewPort.t) {
+ top = pos.top + this.offsetHeight + calEl.offsetHeight;
+ }
+ if (left + calEl.offsetWidth > viewPort.l + viewPort.w) {
+ left = pos.left - calEl.offsetWidth;
+ }
+ if (left < viewPort.l) {
+ left = pos.left + this.offsetWidth
+ }
+ cal.css({
+ visibility: 'visible',
+ display: 'block',
+ top: top + 'px',
+ left: left + 'px'
+ });
+ if (options.onShow.apply(this, [cal.get(0)]) != false) {
+ cal.show();
+ }
+ $(document).bind('mousedown', {cal: cal, trigger: this}, hide);
+ }
+ return false;
+ },
+ hide = function (ev) {
+ if (ev.target != ev.data.trigger && !isChildOf(ev.data.cal.get(0), ev.target, ev.data.cal.get(0))) {
+ if (ev.data.cal.data('datepicker').onHide.apply(this, [ev.data.cal.get(0)]) != false) {
+ ev.data.cal.hide();
+ }
+ $(document).unbind('mousedown', hide);
+ }
+ };
+ return {
+ init: function(options){
+ options = $.extend({}, defaults, options||{});
+ extendDate(options.locale);
+ options.calendars = Math.max(1, parseInt(options.calendars,10)||1);
+ options.mode = /single|multiple|range/.test(options.mode) ? options.mode : 'single';
+ return this.each(function(){
+ if (!$(this).data('datepicker')) {
+ options.el = this;
+ if (options.date.constructor == String) {
+ options.date = parseDate(options.date, options.format);
+ options.date.setHours(0,0,0,0);
+ }
+ if (options.mode != 'single') {
+ if (options.date.constructor != Array) {
+ options.date = [options.date.valueOf()];
+ if (options.mode == 'range') {
+ options.date.push(((new Date(options.date[0])).setHours(23,59,59,0)).valueOf());
+ }
+ } else {
+ for (var i = 0; i < options.date.length; i++) {
+ options.date[i] = (parseDate(options.date[i], options.format).setHours(0,0,0,0)).valueOf();
+ }
+ if (options.mode == 'range') {
+ options.date[1] = ((new Date(options.date[1])).setHours(23,59,59,0)).valueOf();
+ }
+ }
+ } else {
+ options.date = options.date.valueOf();
+ }
+ if (!options.current) {
+ options.current = new Date();
+ } else {
+ options.current = parseDate(options.current, options.format);
+ }
+ options.current.setDate(1);
+ options.current.setHours(0,0,0,0);
+ var id = 'datepicker_' + parseInt(Math.random() * 1000), cnt;
+ options.id = id;
+ $(this).data('datepickerId', options.id);
+ var cal = $(tpl.wrapper).attr('id', id).bind('click', click).data('datepicker', options);
+ if (options.className) {
+ cal.addClass(options.className);
+ }
+ var html = '';
+ for (var i = 0; i < options.calendars; i++) {
+ cnt = options.starts;
+ if (i > 0) {
+ html += tpl.space;
+ }
+ html += tmpl(tpl.head.join(''), {
+ week: options.locale.weekMin,
+ prev: options.prev,
+ next: options.next,
+ day1: options.locale.daysMin[(cnt++)%7],
+ day2: options.locale.daysMin[(cnt++)%7],
+ day3: options.locale.daysMin[(cnt++)%7],
+ day4: options.locale.daysMin[(cnt++)%7],
+ day5: options.locale.daysMin[(cnt++)%7],
+ day6: options.locale.daysMin[(cnt++)%7],
+ day7: options.locale.daysMin[(cnt++)%7]
+ });
+ }
+ cal
+ .find('tr:first').append(html)
+ .find('table').addClass(views[options.view]);
+ fill(cal.get(0));
+ if (options.flat) {
+ cal.appendTo(this).show().css('position', 'relative');
+ layout(cal.get(0));
+ } else {
+ cal.appendTo(document.body);
+ $(this).bind(options.eventName, show);
+ }
+ }
+ });
+ },
+ showPicker: function() {
+ return this.each( function () {
+ if ($(this).data('datepickerId')) {
+ show.apply(this);
+ }
+ });
+ },
+ hidePicker: function() {
+ return this.each( function () {
+ if ($(this).data('datepickerId')) {
+ $('#' + $(this).data('datepickerId')).hide();
+ }
+ });
+ },
+ setDate: function(date, shiftTo){
+ return this.each(function(){
+ if ($(this).data('datepickerId')) {
+ var cal = $('#' + $(this).data('datepickerId'));
+ var options = cal.data('datepicker');
+ options.date = date;
+ if (options.date.constructor == String) {
+ options.date = parseDate(options.date, options.format);
+ options.date.setHours(0,0,0,0);
+ }
+ if (options.mode != 'single') {
+ if (options.date.constructor != Array) {
+ options.date = [options.date.valueOf()];
+ if (options.mode == 'range') {
+ options.date.push(((new Date(options.date[0])).setHours(23,59,59,0)).valueOf());
+ }
+ } else {
+ for (var i = 0; i < options.date.length; i++) {
+ options.date[i] = (parseDate(options.date[i], options.format).setHours(0,0,0,0)).valueOf();
+ }
+ if (options.mode == 'range') {
+ options.date[1] = ((new Date(options.date[1])).setHours(23,59,59,0)).valueOf();
+ }
+ }
+ } else {
+ options.date = options.date.valueOf();
+ }
+ if (shiftTo) {
+ options.current = new Date (options.mode != 'single' ? options.date[0] : options.date);
+ }
+ fill(cal.get(0));
+ }
+ });
+ },
+ getDate: function(formated) {
+ if (this.size() > 0) {
+ return prepareDate($('#' + $(this).data('datepickerId')).data('datepicker'))[formated ? 0 : 1];
+ }
+ },
+ clear: function(){
+ return this.each(function(){
+ if ($(this).data('datepickerId')) {
+ var cal = $('#' + $(this).data('datepickerId'));
+ var options = cal.data('datepicker');
+ if (options.mode != 'single') {
+ options.date = [];
+ fill(cal.get(0));
+ }
+ }
+ });
+ },
+ fixLayout: function(){
+ return this.each(function(){
+ if ($(this).data('datepickerId')) {
+ var cal = $('#' + $(this).data('datepickerId'));
+ var options = cal.data('datepicker');
+ if (options.flat) {
+ layout(cal.get(0));
+ }
+ }
+ });
+ }
+ };
+ }();
+ $.fn.extend({
+ DatePicker: DatePicker.init,
+ DatePickerHide: DatePicker.hidePicker,
+ DatePickerShow: DatePicker.showPicker,
+ DatePickerSetDate: DatePicker.setDate,
+ DatePickerGetDate: DatePicker.getDate,
+ DatePickerClear: DatePicker.clear,
+ DatePickerLayout: DatePicker.fixLayout
+ });
+})(jQuery);
+
+(function(){
+ var cache = {};
+
+ this.tmpl = function tmpl(str, data){
+ // Figure out if we're getting a template, or if we need to
+ // load the template - and be sure to cache the result.
+ var fn = !/\W/.test(str) ?
+ cache[str] = cache[str] ||
+ tmpl(document.getElementById(str).innerHTML) :
+
+ // Generate a reusable function that will serve as a template
+ // generator (and which will be cached).
+ new Function("obj",
+ "var p=[],print=function(){p.push.apply(p,arguments);};" +
+
+ // Introduce the data as local variables using with(){}
+ "with(obj){p.push('" +
+
+ // Convert the template into pure JavaScript
+ str
+ .replace(/[\r\t\n]/g, " ")
+ .split("<%").join("\t")
+ .replace(/((^|%>)[^\t]*)'/g, "$1\r")
+ .replace(/\t=(.*?)%>/g, "',$1,'")
+ .split("\t").join("');")
+ .split("%>").join("p.push('")
+ .split("\r").join("\\'")
+ + "');}return p.join('');");
+
+ // Provide some basic currying to the user
+ return data ? fn( data ) : fn;
+ };
+})();
\ No newline at end of file
diff --git a/app/assets/javascripts/new_admin.js b/app/assets/javascripts/new_admin.js
index cd15fc39..45bfcbbc 100644
--- a/app/assets/javascripts/new_admin.js
+++ b/app/assets/javascripts/new_admin.js
@@ -10,4 +10,7 @@
//= require jquery.isotope.min
//= require jquery.tinyscrollbar.min
//= require orbit-1.0
-//= require tinymce-jquery
\ No newline at end of file
+//= require tinymce-jquery
+//= require tinymce_orbit
+//= require orbit-bar-search
+//= require side_bar_history
\ No newline at end of file
diff --git a/app/assets/javascripts/orbit-1.0.js b/app/assets/javascripts/orbit-1.0.js
index efb7042e..5f69b297 100644
--- a/app/assets/javascripts/orbit-1.0.js
+++ b/app/assets/javascripts/orbit-1.0.js
@@ -9,27 +9,14 @@ function resize() {
}
}
$(document).ready(function(){
- $(document).on('click', '.orbit-bar-member', function(){
- $(this).hasClass('open') ? $(this).removeClass('open') : $(this).addClass('open');
- $('.bar-login .dropdown-menu').toggle();
- return false;
- });
-
- $(document).click(function() {
- $('.orbit-bar-member').removeClass("open");
- $('.bar-login .dropdown-menu').hide();
- });
-
- $(document).on('click', '.bar-login .dropdown-menu', function(e) {
- e.stopPropagation();
- $('.bar-login .dropdown-menu').show();
- });
$('.tip').tooltip({
placement: "left"
});
$(document).on('click', '.privacy', function() {
+
+ console.log($(this).val());
switch ($(this).val()) {
case 'true':
$(this).parents('.controls').children('.select-role').slideUp(300);
@@ -40,24 +27,35 @@ $(document).ready(function(){
}
});
- $(document).on('click', '.toggle-tr-edit', function() {
- $(this).parents('tr').next('.qe-block').removeClass('hide');
- $(this).parents('tr').next('.qe-block').find('.qe-edit-div').addClass('hide');
- $(this).parents('tr').next('.qe-block').find('#qe-' + $(this).attr('rel')).toggleClass('hide');
- });
-
- $(document).on('click', '.sort-header > .sort', function() {
- $.getScript($(this).attr('rel'));
+ var $role = $('.select-role');
+ var method =$('.privacy:eq(1)').attr('checked');
+ if(method == 'checked'){
+ $role.slideDown(0);
+ }
+ $('.privacy').each(function($i) {
+ $(this).click(function() {
+ switch ($i) {
+ case 0:
+ $role.slideUp(300);
+ break;
+ case 1:
+ $role.slideDown(300);
+ break;
+ }
+ });
});
/*tinyscrollbar&windows-Size*/
resize();
- $('#main-sidebar').css("height", viewportheight-40);
- $('#main-sidebar .viewport').css("height", viewportheight-40);
+ var $mainWrapMarginLeft = parseInt($('#main-wrap').css("margin-left"))-2;
+ $('#main-sidebar').css("height", viewportheight-30);
+ $('#main-sidebar .viewport').css("height", viewportheight-30);
$('.post-title').css("width", viewportwidth-495);
+ $('#main-wrap .subnav').css("width", viewportwidth-$mainWrapMarginLeft);
$('#main-sidebar').tinyscrollbar();
$('.detal-list').tinyscrollbar();
- $('#main-sidebar').tinyscrollbar({size:(viewportheight-44)});
+ $('#main-sidebar').tinyscrollbar({size:(viewportheight-34)});
+ mainTablePosition();
/*isotope*/
var $container = $('#isotope');
@@ -74,18 +72,28 @@ $(window).resize(function(){
$('#main-sidebar').css("height", viewportheight-30);
$('#main-sidebar .viewport').css("height", viewportheight-30);
$('.post-title').css("width", viewportwidth-495);
- $('#main-wrap > .subnav').css("width", viewportwidth-$mainWrapMarginLeft)
+ $('#main-wrap .subnav').css("width", viewportwidth-$mainWrapMarginLeft)
$('#main-sidebar').tinyscrollbar({size:(viewportheight-34)});
- mainTablePosition()
+ mainTablePosition();
});
/*main-table position*/
function mainTablePosition() {
- var $height = $('#main-wrap > .subnav').height()
- var $table = $('#main-wrap > .table')
- //alert ($table.height())
- $table.stop().animate({marginTop:$height},500)
- //$table.css({marginTop : $height})
-}
+ var $height = $('#main-wrap .subnav').length && $('#main-wrap .subnav').height();
+ var $table = $('.main-list').length && $('.main-list:last');
+ if($table && $table==0){
+ $table.css({marginTop:$height});
+ }
+ else if($table){
+ if($height>0){
+ $height = $height-17;
+ }
+ $table.stop().animate({marginTop:$height},500);
+ }
+ else if($('#main-wrap .subnav')){
+ var $object = $('#main-wrap .subnav').next();
+ $object.css({marginTop:$height});
+ };
+};
$(window).scroll(function () {
//var $mainWrapMarginLeft = parseInt($('#main-wrap').css("margin-left"))-1;
//var $subnavWidth = parseInt($('#main-wrap > .subnav').css("width"));
diff --git a/app/assets/javascripts/orbit-bar-member.js b/app/assets/javascripts/orbit-bar-member.js
new file mode 100644
index 00000000..5e65d4a3
--- /dev/null
+++ b/app/assets/javascripts/orbit-bar-member.js
@@ -0,0 +1,15 @@
+$(document).on('click', '.orbit-bar-member', function(){
+ $(this).hasClass('open') ? $(this).removeClass('open') : $(this).addClass('open');
+ $('.bar-login .dropdown-menu').toggle();
+ return false;
+});
+
+$(document).click(function() {
+ $('.orbit-bar-member').removeClass("open");
+ $('.bar-login .dropdown-menu').hide();
+});
+
+$(document).on('click', '.bar-login .dropdown-menu', function(e) {
+ e.stopPropagation();
+ $('.bar-login .dropdown-menu').show();
+});
\ No newline at end of file
diff --git a/app/assets/javascripts/orbit-bar-search.js b/app/assets/javascripts/orbit-bar-search.js
new file mode 100644
index 00000000..26f44d84
--- /dev/null
+++ b/app/assets/javascripts/orbit-bar-search.js
@@ -0,0 +1,20 @@
+$(document).on('click', '.orbit-bar-search', function (){
+ if ($(this).parents('.search').hasClass('visible')){
+ $(this).parents('.search').stop().animate({
+ 'width':'28px',
+ });
+ $(this).parents('.search').css({
+ 'background-color': 'transparent',
+ });
+ $(this).parents('.search').removeClass('visible');
+ }
+ else{
+ $(this).parents('.search').stop().animate({
+ 'width':'265px',
+ });
+ $(this).parents('.search').css({
+ 'background-color': 'rgba(0, 0, 0, 0.5)',
+ });
+ $(this).parents('.search').addClass('visible');
+ }
+});
\ No newline at end of file
diff --git a/app/assets/javascripts/side_bar_history.js b/app/assets/javascripts/side_bar_history.js
index 036c63d4..4b5da1d4 100644
--- a/app/assets/javascripts/side_bar_history.js
+++ b/app/assets/javascripts/side_bar_history.js
@@ -1,31 +1,49 @@
-$(function () {
- $('#back_sidebar a, #back_main a.nav').live('click',
- function () {
- $.getScript(this.href);
- history.pushState(null, document.title, this.href);
- history_edited = true;
- return false;
- }
- );
+var history_edited = false;
- $('#back_main a.reload').live('click',
- function () {
- $.getScript(this.href);
- history.replaceState(null, document.title, this.href);
- history_edited = true;
- return false;
- }
- );
+// $('#back_sidebar a, #back_main a.nav').live('click',
+// function () {
+// $.getScript(this.href);
+// history.pushState(null, document.title, this.href);
+// history_edited = true;
+// return false;
+// }
+// );
- $('.form').live('submit', function () {
- $.post(this.action, $(this).serialize(), null, 'script');
- history_edited = true;
+// $('#back_main a.reload').live('click',
+// function () {
+// $.getScript(this.href);
+// history.replaceState(null, document.title, this.href);
+// history_edited = true;
+// return false;
+// }
+// );
+
+// $('.form').live('submit', function () {
+// $.post(this.action, $(this).serialize(), null, 'script');
+// history_edited = true;
+// return false;
+// });
+
+$(document).on('click', '.js_history',
+ function () {
+ $.getScript(this.href);
+ history.pushState(null, document.title, this.href);
+ history_edited = true;
return false;
- });
+ }
+);
- $(window).bind("popstate", function () {
- if (history_edited) {
- $.getScript(location.href);
- }
- });
+$(document).on('click', '.pagination a',
+ function () {
+ $.getScript(this.href);
+ history.pushState(null, document.title, this.href);
+ history_edited = true;
+ return false;
+ }
+);
+
+$(window).bind("popstate", function () {
+ if (history_edited) {
+ $.getScript(location.href);
+ }
});
\ No newline at end of file
diff --git a/app/assets/javascripts/tinymce_orbit.js b/app/assets/javascripts/tinymce_orbit.js
new file mode 100644
index 00000000..60492914
--- /dev/null
+++ b/app/assets/javascripts/tinymce_orbit.js
@@ -0,0 +1,25 @@
+$(function() {
+ $('.tinymce_textarea').tinymce({
+ theme: 'advanced',
+ plugins : "autolink,lists,spellchecker,pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template",
+
+ // Theme options
+ theme_advanced_buttons1 : "bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,formatselect,fontselect,fontsizeselect",
+ theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,bullist,numlist,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,forecolor,backcolor",
+ theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|,fullscreen",
+ theme_advanced_toolbar_location : "top",
+ theme_advanced_toolbar_align : "left",
+ theme_advanced_statusbar_location : "bottom",
+ theme_advanced_resizing : true,
+
+ // Skin options
+ skin : "o2k7",
+ skin_variant : "silver",
+
+ // Drop lists for link/image/media/template dialogs
+ template_external_list_url : "js/template_list.js",
+ external_link_list_url : "js/link_list.js",
+ external_image_list_url : "js/image_list.js",
+ media_external_list_url : "js/media_list.js"
+ });
+});
\ No newline at end of file
diff --git a/app/assets/stylesheets/admin/ad_banner_preview.css.erb b/app/assets/stylesheets/admin/ad_banner_preview.css.erb
new file mode 100644
index 00000000..f46be689
--- /dev/null
+++ b/app/assets/stylesheets/admin/ad_banner_preview.css.erb
@@ -0,0 +1,4 @@
+.banner-preview {
+ width: auto;
+ left: 35%;
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/bootstrap-orbit.css b/app/assets/stylesheets/bootstrap-orbit.css
index 88bca1b3..34425d50 100644
--- a/app/assets/stylesheets/bootstrap-orbit.css
+++ b/app/assets/stylesheets/bootstrap-orbit.css
@@ -98,10 +98,18 @@ h1, h2, h3, h4, h5, h6 {
border-radius: 0 0 4px 4px;
}
table .span1-2 {
- width: 94px;
+ min-width: 85px;
+ float: none;
+ margin-left: 0;
+}
+table .span1-3 {
+ min-width: 200px;
float: none;
margin-left: 0;
}
.qe-block .form-horizontal .form-actions {
text-align:right;
+}
+.modal.fade {
+ top: -50%;
}
\ No newline at end of file
diff --git a/app/assets/stylesheets/inc/permission-checkbox.css b/app/assets/stylesheets/inc/permission-checkbox.css
new file mode 100644
index 00000000..0adf7225
--- /dev/null
+++ b/app/assets/stylesheets/inc/permission-checkbox.css
@@ -0,0 +1,77 @@
+.checkblock {
+ display: inline-block;
+ float: left;
+ width: 200px;
+}
+.check[type="checkbox"]{
+ display:none;
+}
+.checkbox{
+ padding: 5px;
+ margin: 5px 5px 10px;
+ display: inline-block;
+ color:#777777;
+ text-shadow: 0 1px 0px rgba(255,255,255,.4);
+ border-radius: 3px;
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ height: 30px;
+ position: relative;
+ cursor: pointer;
+ background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #ededed), color-stop(1, #dfdfdf) );
+ background:-moz-linear-gradient( center top, #ededed 5%, #dfdfdf 100% );
+ filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed', endColorstr='#dfdfdf');
+ -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+ -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+ box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+.checkbox .check-icon {
+ display: none;
+ position: absolute;
+ width: 26px;
+ height: 26px;
+ background: url('img/check.png') no-repeat left top;
+ right: -10px;
+ top: -5px;
+}
+.checkbox .member-name {
+ cursor: pointer;
+ font-family: helvetica;
+ font-size: 12px;
+ line-height: 30px;
+ padding: 0 10px 0 40px;
+ color: #333333;
+ display: inline-block;
+ margin-bottom: 0;
+}
+.member-avatar {
+ position: absolute;
+ width: 34px;
+ height: 34px;
+ overflow: hidden;
+ margin-top: -2px;
+}
+img.member-img {
+ max-width: 100%;
+}
+.checked .check-icon {
+ display: block;
+}
+.popover-inner {
+ width: auto;
+ display: inline-block;
+ text-align: center;
+}
+.popover-title {
+ display: block;
+ font-size: 12px;
+ font-weight: normal;
+ padding: 3px 10px;
+}
+.popover-content {
+ padding: 3px 10px;
+ color: #898989;
+}
+.popover-content p {
+ font-size: 12px;
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/inc/permission-checkbox.css.erb.css b/app/assets/stylesheets/inc/permission-checkbox.css.erb.css
new file mode 100644
index 00000000..5a2deb60
--- /dev/null
+++ b/app/assets/stylesheets/inc/permission-checkbox.css.erb.css
@@ -0,0 +1,77 @@
+.checkblock {
+ display: inline-block;
+ float: left;
+ width: 200px;
+}
+.check[type="checkbox"]{
+ display:none;
+}
+.checkbox{
+ padding: 5px;
+ margin: 5px 5px 10px;
+ display: inline-block;
+ color:#777777;
+ text-shadow: 0 1px 0px rgba(255,255,255,.4);
+ border-radius: 3px;
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ height: 30px;
+ position: relative;
+ cursor: pointer;
+ background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #ededed), color-stop(1, #dfdfdf) );
+ background:-moz-linear-gradient( center top, #ededed 5%, #dfdfdf 100% );
+ filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed', endColorstr='#dfdfdf');
+ -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+ -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+ box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+.checkbox .check-icon {
+ display: none;
+ position: absolute;
+ width: 26px;
+ height: 26px;
+ background: url(<%= asset_path "check.png" %>) no-repeat left top;
+ right: -10px;
+ top: -5px;
+}
+.checkbox .member-name {
+ cursor: pointer;
+ font-family: helvetica;
+ font-size: 12px;
+ line-height: 30px;
+ padding: 0 10px 0 40px;
+ color: #333333;
+ display: inline-block;
+ margin-bottom: 0;
+}
+.member-avatar {
+ position: absolute;
+ width: 34px;
+ height: 34px;
+ overflow: hidden;
+ margin-top: -2px;
+}
+img.member-img {
+ max-width: 100%;
+}
+.checked .check-icon {
+ display: block;
+}
+.popover-inner {
+ width: auto;
+ display: inline-block;
+ text-align: center;
+}
+.popover-title {
+ display: block;
+ font-size: 12px;
+ font-weight: normal;
+ padding: 3px 10px;
+}
+.popover-content {
+ padding: 3px 10px;
+ color: #898989;
+}
+.popover-content p {
+ font-size: 12px;
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/lib/datepicker.css b/app/assets/stylesheets/lib/datepicker.css
new file mode 100644
index 00000000..2487c921
--- /dev/null
+++ b/app/assets/stylesheets/lib/datepicker.css
@@ -0,0 +1,205 @@
+div.datepicker {
+ position: relative;
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ height: 147px;
+ cursor: default;
+ display: none;
+}
+.datepickerContainer {
+ padding: 10px;
+ margin: 0 auto;
+}
+/*
+.datepickerBorderT {
+ position: absolute;
+ left: 10px;
+ top: 0;
+ right: 10px;
+ height: 10px;
+ background: url(../images/datepicker_t.png);
+}
+.datepickerBorderB {
+ position: absolute;
+ left: 10px;
+ bottom: 0;
+ right: 10px;
+ height: 10px;
+ background: url(../images/datepicker_b.png);
+}
+.datepickerBorderL {
+ position: absolute;
+ left: 0;
+ bottom: 10px;
+ top: 10px;
+ width: 10px;
+ background: url(../images/datepicker_l.png);
+}
+.datepickerBorderR {
+ position: absolute;
+ right: 0;
+ bottom: 10px;
+ top: 10px;
+ width: 10px;
+ background: url(../images/datepicker_r.png);
+}
+.datepickerBorderTL {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 10px;
+ height: 10px;
+ background: url(../images/datepicker_tl.png);
+}
+.datepickerBorderTR {
+ position: absolute;
+ top: 0;
+ right: 0;
+ width: 10px;
+ height: 10px;
+ background: url(../images/datepicker_tr.png);
+}
+.datepickerBorderBL {
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ width: 10px;
+ height: 10px;
+ background: url(../images/datepicker_bl.png);
+}
+.datepickerBorderBR {
+ position: absolute;
+ bottom: 0;
+ right: 0;
+ width: 10px;
+ height: 10px;
+ background: url(../images/datepicker_br.png);
+}
+*/
+.datepickerHidden {
+ display: none;
+}
+div.datepicker table {
+ width: 260px;
+ border-collapse:collapse;
+}
+div.datepicker a {
+ text-decoration: none;
+ cursor: default;
+ outline: none;
+}
+div.datepicker table td {
+ text-align: right;
+ padding: 0;
+ margin: 0;
+}
+div.datepicker th {
+ text-align: center;
+ color: #999;
+ font-weight: normal;
+}
+div.datepicker tbody th {
+ /*text-align: left;*/
+}
+div.datepicker tbody a {
+ display: block;
+ width: 100%;
+ text-align: center;
+}
+.datepickerWeek a {
+ color: #F60;
+}
+.datepickerWeek a:hover {
+ color: #FC0 !important;
+}
+.datepickerDays a {
+ width: 20px;
+ line-height: 16px;
+ height: 16px;
+ padding-right: 2px;
+}
+.datepickerYears a,
+.datepickerMonths a{
+ width: 44px;
+ line-height: 36px;
+ height: 36px;
+ text-align: center;
+}
+td.datepickerNotInMonth a {
+ color: #666;
+}
+tbody.datepickerDays td.datepickerSelected{
+ background: #0088CC;
+}
+tbody.datepickerDays td.datepickerSelected a{
+ color: #FFF;
+}
+tbody.datepickerDays td.datepickerNotInMonth.datepickerSelected {
+ background: #17384d;
+}
+tbody.datepickerYears td.datepickerSelected,
+tbody.datepickerMonths td.datepickerSelected{
+ background: #17384d;
+}
+div.datepicker a:hover,
+div.datepicker a:hover {
+ color: #88c5eb;
+}
+div.datepicker td.datepickerNotInMonth a:hover {
+ color: #999;
+}
+div.datepicker tbody th {
+ /*text-align: left;*/
+}
+.datepickerSpace div {
+ width: 20px;
+}
+.datepickerGoNext a,
+.datepickerGoPrev a,
+.datepickerMonth a {
+ text-align: center;
+ height: 20px;
+ line-height: 20px;
+}
+.datepickerGoNext a {
+ float: right;
+ width: 20px;
+}
+.datepickerGoPrev a {
+ float: left;
+ width: 20px;
+}
+table.datepickerViewDays tbody.datepickerMonths,
+table.datepickerViewDays tbody.datepickerYears {
+ display: none;
+}
+table.datepickerViewMonths tbody.datepickerDays,
+table.datepickerViewMonths tbody.datepickerYears,
+table.datepickerViewMonths tr.datepickerDoW {
+ display: none;
+}
+table.datepickerViewYears tbody.datepickerDays,
+table.datepickerViewYears tbody.datepickerMonths,
+table.datepickerViewYears tr.datepickerDoW {
+ display: none;
+}
+td.datepickerDisabled a,
+td.datepickerDisabled.datepickerNotInMonth a{
+ color: #333;
+}
+td.datepickerDisabled a:hover {
+ color: #333;
+}
+td.datepickerSpecial a {
+ background: #700;
+}
+td.datepickerSpecial.datepickerSelected a {
+ background: #a00;
+}
+
+/*Layout*/
+#widgetCalendar {
+ height: 0;
+ overflow: hidden;
+ position: relative;
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/list.css b/app/assets/stylesheets/list.css
index ccf35f24..11f17a55 100644
--- a/app/assets/stylesheets/list.css
+++ b/app/assets/stylesheets/list.css
@@ -9,9 +9,9 @@
.main-list {
margin-bottom: 0;
}
-.main-list thead th {
- background-color: rgba(0,0,0,0.05);
- border-right: 1px solid #ddd;
+.main-wrap>.main-list thead th {
+ background-color: transparent;
+ border-right: medium none;
}
.main-list thead th:last-child {
border-right: none;
@@ -29,19 +29,22 @@
}
.main-list tbody .quick-edit {
position:relative;
- height:40px;
+ height:20px;
}
.main-list tbody .quick-edit .nav {
/*left: -55px;*/
position: absolute;
/*top: -3px;*/
width: 350px;
+ left: -8px;
}
.main-list td {
- /*height:80px;*/
+ background-color: #FFFFFF;
+ border-bottom: 1px solid #DDDDDD;
+ border-top: medium none;
}
.main-list .nav {
- margin-top: 15px;
+ margin-top: 0;
margin-bottom: 3px;
}
.main-list tr.with_action:hover .hide {
@@ -53,7 +56,7 @@
}
.main-list .label-td {
background-color: rgba(255, 255, 255, 1);
- height: 60px;
+ height: 40px;
overflow: hidden;
position: absolute;
width: 100%;
@@ -75,6 +78,15 @@
-moz-border-radius: 3px;
z-index: 5;
}
+.table-label {
+ background-color: #F2F2F2;
+ position: relative;
+}
+.table-label .main-list thead th {
+ background-color: #F2F2F2;
+ border-right: 1px solid #DDDDDD;
+ border-top: 1px solid #DDDDDD !important;
+}
.route-group .route {
padding: 0;
}
@@ -109,6 +121,9 @@ legend {
border-radius: 0;
border-left: none;
border-right: none;
+ position: fixed;
+ top: 30px;
+ z-index: 50;
}
.subnav .nav > li:first-child > a, .subnav .nav > li:first-child > a:hover {
-moz-border-radius: 0;
diff --git a/app/assets/stylesheets/reset.css.erb b/app/assets/stylesheets/reset.css.erb
index 0d91f32a..5c0a9cd5 100644
--- a/app/assets/stylesheets/reset.css.erb
+++ b/app/assets/stylesheets/reset.css.erb
@@ -2,7 +2,6 @@ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockq
-webkit-text-size-adjust:none;
}
html, body{
- background: url(<%= asset_path 'background.jpg' %>) repeat left top;
height: 100%;
}
/*自定*/
diff --git a/app/assets/stylesheets/site_items.css.erb b/app/assets/stylesheets/site_items.css.erb
index 38b0a185..4e23bd4c 100644
--- a/app/assets/stylesheets/site_items.css.erb
+++ b/app/assets/stylesheets/site_items.css.erb
@@ -1,482 +1,483 @@
-html, body{
- height: 100%;
- margin: 0;
- padding: 0;
-}
-html{
- background: url(<%= asset_path "body.jpg" %>) no-repeat fixed 0 0 transparent;
- background-size: cover;
-}
-
-body{
- color: #000000;
- font-family: Helvetica, '微軟正黑體';
-}
-#back_banner_link{
- background:-webkit-gradient( linear, left top, left bottom, color-stop(0, #787e82), color-stop(0.05, #61676c), color-stop(1, #292c2d) );
- background:-moz-linear-gradient( center top -90deg, #787e82 0%, #61676c 5%, #292c2d 100% );
- filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#61676c', endColorstr='#292c2d');
- -moz-box-shadow: 0px 1px 5px 0px rgba(0,0,0,.7);
- -webkit-box-shadow: 0px 1px 5px 0px rgba(0,0,0,.7);
- box-shadow: 0px 1px 5px 0px rgba(0,0,0,.7);
- border-top: 1px solid #474a4c;
- border-bottom: 1px solid #1d2020;
- height: 41px;
- width: 100%;
- behavior: url(<%= asset_path "PIE.htc" %>);
-}
-.hmenu{
- float: right;
- height: 41px;
-}
-#back_orbit{
- background:-webkit-gradient( linear, left top, left bottom, color-stop(0, #70787d), color-stop(1, #3b4043) );
- background:-moz-linear-gradient( center top -90deg, #70787d 0%, #3b4043 100% );
- filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#70787d', endColorstr='#3b4043');
- -webkit-border-radius: 0px 0px 5px 5px;
- -moz-border-radius: 0px 0px 5px 5px;
- border-radius: 0px 0px 5px 5px;
- -moz-box-shadow: 0px 1px 1px 0px rgba(0,0,0,.7);
- -webkit-box-shadow: 0px 1px 1px 0px rgba(0,0,0,.7);
- box-shadow: 0px 1px 1px 0px rgba(0,0,0,.7);
- cursor: pointer;
- float: left;
- height: 43px;
- margin-left: 10px;
- width: 41px;
- behavior: url(<%= asset_path "PIE.htc" %>);
-}
-#back_orbit span{
- text-indent: -9999px;
- background: url(<%= asset_path "bar_orbit.png" %>) no-repeat scroll 0 0 transparent;
- display: block;
- height: 43px;
- width: 100%;
-}
-#back_orbit:hover{
- background:-webkit-gradient( linear, left top, left bottom, color-stop(0, #fefefe), color-stop(1, #e4e4e4) );
- background:-moz-linear-gradient( center top -90deg, #fefefe 0%, #e4e4e4 100% );
- filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fefefe', endColorstr='#e4e4e4');
- -webkit-border-radius: 0px;
- -moz-border-radius: 0px;
- border-radius: 0px;
-}
-#back_orbit:hover span{
- background-position: 0 -44px;
-}
-#back_orbit:hover #orblist{
- display:block;
-}
-#orblist{
- background:-webkit-gradient( linear, left top, left bottom, color-stop(0, #e4e4e4), color-stop(1, #FFFFFF) );
- background:-moz-linear-gradient( center top -90deg, #e4e4e4 0%, #FFFFFF 100% );
- filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#e4e4e4', endColorstr='#FFFFFF');
- -webkit-border-radius: 0px 3px 3px 3px;
- -moz-border-radius: 0px 3px 3px 3px;
- border-radius: 0px 3px 3px 3px;
- -webkit-box-shadow: 0 3px 3px #000000;
- -moz-box-shadow: 0 3px 3px #000000;
- box-shadow: 0 3px 3px #000000;
- display: none;
- margin: 0;
- padding: 10px;
- position: absolute;
- top: 43px;
- width: 130px;
-}
-#orblist li{
- border-bottom:1px solid #aaa;
- list-style:none;
-}
-.orblink{
- color: #333333;
- display: block;
- font: 12px/100% arial,sans-serif;
- padding: 5px;
- text-decoration: none;
-}
-.orblink:hover{
- background:#eee;
- color:#333;
-}
-#log_out{
- -moz-box-shadow:inset 1px 0px 0px 0px #73777b;
- -webkit-box-shadow:inset 1px 0px 0px 0px #73777b;
- box-shadow:inset 1px 0px 0px 0px #73777b;
- border-right:1px solid #41474c;
- border-left:1px solid #41474c;
- float:right;
- width:41px;
- height:41px;
-}
-#log_out:hover{
- background:-webkit-gradient( linear, left top, left bottom, color-stop(0, #01afde), color-stop(1, #007ec6) );
- background:-moz-linear-gradient( center top -90deg, #01afde 0%, #007ec6 100% );
- filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#01afde', endColorstr='#007ec6');
-}
-#log_out a{
- background: url(<%= asset_path "service_btn.png" %>) no-repeat scroll right 0 transparent;
- display: block;
- height: 41px;
- text-indent: -9999px;
- width: 41px;
-}
-#log_out a:hover{
- background: url(<%= asset_path "service_btn.png" %>) no-repeat scroll right bottom transparent !important;
-}
-.lang{
- color: #FFFFFF;
- float: right;
- font-size: 15px;
- line-height: 40px;
- margin-right: 10px;
-}
-.lang a{
- color:#fff;
- text-decoration:none;
-}
-.lang a:hover{
- text-decoration:underline;
-}
-#back_content{
- height: 100%;
-}
-#back_footer{
- background-color: #101010;
- bottom: 0;
- color: #FFFFFF;
- font-size: 11px;
- padding: 10px;
- position: fixed;
- width: 100%;
- left: 0;
- box-shadow: 0 -3px 4px #000;
-}
-.items_setup{
- padding:42px 0 0 0;
-}
-#back_sidebar .items_setup .list li{
- padding: 6px 0 7px 5px;
-}
-#back_sidebar .items_setup .list li a{
- display: inline;
- font-size: 0.9em;
- padding: 0;
-}
-#back_sidebar .items_setup .list li a span{
- background:none;
- padding:0;
- text-shadow:none;
-}
-.main {
- background: none repeat scroll 0 0 #FFFFFF;
- height: 100%;
- margin-left: 220px;
- padding: 0 40px;
- position: relative;
-}
-.main_list {
- padding-top: 70px;
-}
-.main_list ul {
- clear:both;
-}
-#porfile {
- padding-top: 100px;
-}
-/*add_buttom*/
-.button_bar {
- float: right;
- -moz-box-shadow:inset 0px 1px 0px 0px #666, 0px 0px 3px black;
- -webkit-box-shadow:inset 0px 1px 0px 0px #666, 0px 0px 3px black;
- box-shadow:inset 0px 1px 0px 0px #666, 0px 0px 3px black;
- background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #4f4f4f), color-stop(1, #000000) );
- background:-moz-linear-gradient( center top, #4f4f4f 5%, #000000 100% );
- filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#4f4f4f', endColorstr='#000000');
- background-color:#4f4f4f;
- -moz-border-radius:5px;
- -webkit-border-radius:5px;
- border-radius:5px;
- display:inline-block;
- padding:0;
- margin:10px 0 60px;
-}
-.button_bar a {
- text-decoration:none;
- text-shadow:0px -1px 0px #000000;
- font-size:12px;
- color:#EDEDED;
- border-right:1px solid #555;
- -moz-box-shadow:1px 0px 0px black;
- -webkit-box-shadow:1px 0px 0px black;
- box-shadow:1px 0px 0px black;
- padding: 6px 10px 4px;
- display: inline-block;
- float: left;
-}
-.button_bar a:active {
- padding: 7px 10px 3px !important;
- text-shadow:0px 1px 0px #000000;
- background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #000000), color-stop(1, #4f4f4f) );
- background:-moz-linear-gradient( center top, #000000 5%, #4f4f4f 100% );
- filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#000000', endColorstr='#4f4f4f');
-}
-.button_bar a:last-child {
- border-right:none;
- -moz-box-shadow:none;
- -webkit-box-shadow:none;
- box-shadow:none;
- -moz-border-radius:0px 5px 5px 0px;
- -webkit-border-radius:0px 5px 5px 0px;
- border-radius:0px 5px 5px 0px;
-}
-.button_bar a:first-child {
- -moz-border-radius:5px 0px 0px 5px;
- -webkit-border-radius:5px 0px 0px 5px;
- border-radius:5px 0px 0px 5px;
-}
-.button_bar a.new {
- padding: 5px 10px;
- -moz-border-radius:5px;
- -webkit-border-radius:5px;
- border-radius:5px;
-}
-.button_bar a:hover {
- color:#FFFFFF;
-}
-.up {
- margin:10px 0;
-}
-#person {
- left: 245px;
- position: fixed;
- text-align: center;
- top: 75px;
- width: 140px;
- background-color:#FFF;
- padding:15px;
- border-radius: 5px;
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- -moz-box-shadow: 0px 0px 4px #180902; /* Firefox */
- -webkit-box-shadow: 0px 0px 4px #180902;/* Safari 和 Chrome */
- box-shadow: 0px 0px 4px #180902; /* Opera 10.5 + */
-}
-#file {
- display:none;
-}
-#person img {
-}
-.user_mail {
- border: medium none;
- border:1px solid #DDDDDD;
- color: #666666;
- font-size: 12px;
- width: 140px;
-}
-#person label {
- display: block;
- margin: 15px 0 0;
-}
-#person label input {
-}
-#person label #user_admin {
- float:right;
- margin: 0;
-}
-#person label span {
- text-align:left;
- font-size:11px;
- color:#888;
- display:block;
-}
-#person select {
- border: 1px solid #DDDDDD;
- padding: 0;
- width: 140px;
-}
-#porfile .users{
- margin-left: 180px;
-}
-.roles_block {
- background: url(<%= asset_path "75.png" %>) repeat left top;
- min-width:710px;
- margin-bottom:50px;
- position:relative;
- padding-bottom: 20px;
- border-radius: 5px;
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- -moz-box-shadow: 0px 0px 4px #180902; /* Firefox */
- -webkit-box-shadow: 0px 0px 4px #180902;/* Safari 和 Chrome */
- box-shadow: 0px 0px 4px #180902; /* Opera 10.5 + */
-}
-.roles_block h2 {
- color: #FFFFFF;
- font-weight: normal;
- margin: 0;
- padding: 0;
- position: absolute;
- text-shadow: 0 3px 2px #000000;
- top: -30px;
-}
-.main hr {
- height:8px;
- border:none;
- margin:0;
- border-radius: 5px 5px 0px 0px;
- -moz-border-radius: 5px 5px 0px 0px;
- -webkit-border-radius: 5px 5px 0px 0px;
- border-bottom:1px solid #000;
-}
-.main2{
- padding:70px 0 0;
-}
-#basic_block hr {
- background-color: #666666;
-}
-#teacher_block hr {
- background-color: #0071A9;
-}
-#student_block hr {
- background-color: #AF0045;
-}
-.info_input {
- padding:10px 20px;
-}
-.info_input table {
- color:#fff;
- width:100%;
- font-size:14px;
-}
-.info_input table td {
- padding:5px 10px 5px 0;
- width: 10%;
-}
-.info_input .list_head {
- background:url(<%= asset_path "line.png" %>) left bottom repeat-x;
-}
-.info_input .list_head td {
-}
-.info_input .list_item {
- color:#AEAEAE;
-}
-.info_input .add {
- display:block;
- padding-left:22px;
- font-size:12px;
- line-height:21px;
- height:19px;
- background:url(<%= asset_path "icon.png" %>) no-repeat -59px 0;
- margin-top: 10px;
- color: #DDDDDD;
-}
-
-.main table {
- width:100%;
-}
-.main td {
- padding-left:20px;
- color:#fff;
- font-size:14px;
- line-height:40px;
-}
-.main tr.have td{
- background: url(<%= asset_path "75.png" %>) repeat left top;
-}
-.main tr.have td:first-child{
- border-radius: 5px 0 0 5px;
- -moz-border-radius: 5px 0 0 5px;
- -webkit-border-radius: 5px 0 0 5px;
-}
-.main tr.have td:last-child{
- border-radius: 0 5px 5px 0;
- -moz-border-radius: 0 5px 5px 0;
- -webkit-border-radius: 0 5px 5px 0;
-}
-.main thead td {
- line-height:40px;
- font-size:16px;
- text-shadow: 0px 1px 1px #3e2914;
-}
-.main thead td.action {
- width:140px;
-}
-.main tbody td.roles {
- background-image: url(<%= asset_path "roles_type.jpg" %>);
- background-repeat: repeat-x;
-}
-.main tbody td.teacher {
- background-position: 0 -54px;
-}
-.main tbody td.student {
- background-position: 0 -5px;
-}
-.main tbody td.action a {
- background-image: url(<%= asset_path "icon.png" %>);
- display: inline-block;
- height: 19px;
- margin-right: 10px;
- top: 8px;
- text-indent: -9999px;
- width: 19px;
- position: relative;
-}
-.main tbody td.action a.show {
- background-position: left top;
-}
-.main tbody td.action a.show:hover {
- background-position: left -19px;
-}
-.main tbody td.action a.edit {
- background-position: -19px top;
-}
-.main tbody td.action a.edit:hover {
- background-position: -19px -19px;
-}
-.main tbody td.action a.delete {
- background-position: -38px top;
-}
-.main tbody td.action a.delete:hover {
- background-position: -38px -19px;
-}
-.main tbody td.action a.switch {
- background: url(<%= asset_path "switch.png" %>) no-repeat left 3px;
- width: 40px;
-}
-.main tbody tr.disable td.action a.switch {
- background-position:left bottom;
-}
-.main tbody td.action a.delete:hover {
- background-position: -38px -19px;
-}
-.main tbody tr.have {
-}
-.main tbody tr.disable {
- opacity: 0.7;
-}
-.main tbody tr {
- background:none;
- height:15px;
-}
-h1{
- margin:0 0 20px;
-}
-p{
- margin:0 0 10px;
-}
-
-#back_sidebar .items_setup .list li{
- background:url(<%= asset_path "sidebar_li2.jpg" %>) repeat left top;
- border:none;
- padding: 0 0 0 5px;
-}
-#back_sidebar .items_setup .list li a{
- line-height:31px;
-}
-#back_sidebar .items_setup .list li:hover{
- background:url(<%= asset_path "sidebar_li2.jpg" %>) repeat left top;
- border:none;
-}
-#back_sidebar .items_setup ul .list {
+html, body{
+ height: 100%;
+ margin: 0;
+ padding: 0;
+}
+html{
+ background: url(<%= asset_path "body.jpg" %>) no-repeat fixed 0 0 transparent;
+ background-size: cover;
+}
+
+body{
+ color: #000000;
+ font-family: Helvetica, '微軟正黑體';
+}
+#back_banner_link{
+ background:-webkit-gradient( linear, left top, left bottom, color-stop(0, #787e82), color-stop(0.05, #61676c), color-stop(1, #292c2d) );
+ background:-moz-linear-gradient( center top -90deg, #787e82 0%, #61676c 5%, #292c2d 100% );
+ filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#61676c', endColorstr='#292c2d');
+ -moz-box-shadow: 0px 1px 5px 0px rgba(0,0,0,.7);
+ -webkit-box-shadow: 0px 1px 5px 0px rgba(0,0,0,.7);
+ box-shadow: 0px 1px 5px 0px rgba(0,0,0,.7);
+ border-top: 1px solid #474a4c;
+ border-bottom: 1px solid #1d2020;
+ height: 41px;
+ width: 100%;
+ behavior: url(<%= asset_path "PIE.htc" %>);
+}
+.hmenu{
+ float: right;
+ height: 41px;
+}
+#back_orbit{
+ background:-webkit-gradient( linear, left top, left bottom, color-stop(0, #70787d), color-stop(1, #3b4043) );
+ background:-moz-linear-gradient( center top -90deg, #70787d 0%, #3b4043 100% );
+ filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#70787d', endColorstr='#3b4043');
+ -webkit-border-radius: 0px 0px 5px 5px;
+ -moz-border-radius: 0px 0px 5px 5px;
+ border-radius: 0px 0px 5px 5px;
+ -moz-box-shadow: 0px 1px 1px 0px rgba(0,0,0,.7);
+ -webkit-box-shadow: 0px 1px 1px 0px rgba(0,0,0,.7);
+ box-shadow: 0px 1px 1px 0px rgba(0,0,0,.7);
+ cursor: pointer;
+ float: left;
+ height: 43px;
+ margin-left: 10px;
+ width: 41px;
+ behavior: url(<%= asset_path "PIE.htc" %>);
+}
+#back_orbit span{
+ text-indent: -9999px;
+ background: url(<%= asset_path "bar_orbit.png" %>) no-repeat scroll 0 0 transparent;
+ display: block;
+ height: 43px;
+ width: 100%;
+}
+#back_orbit:hover{
+ background:-webkit-gradient( linear, left top, left bottom, color-stop(0, #fefefe), color-stop(1, #e4e4e4) );
+ background:-moz-linear-gradient( center top -90deg, #fefefe 0%, #e4e4e4 100% );
+ filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fefefe', endColorstr='#e4e4e4');
+ -webkit-border-radius: 0px;
+ -moz-border-radius: 0px;
+ border-radius: 0px;
+}
+#back_orbit:hover span{
+ background-position: 0 -44px;
+}
+#back_orbit:hover #orblist{
+ display:block;
+}
+#orblist{
+ background:-webkit-gradient( linear, left top, left bottom, color-stop(0, #e4e4e4), color-stop(1, #FFFFFF) );
+ background:-moz-linear-gradient( center top -90deg, #e4e4e4 0%, #FFFFFF 100% );
+ filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#e4e4e4', endColorstr='#FFFFFF');
+ -webkit-border-radius: 0px 3px 3px 3px;
+ -moz-border-radius: 0px 3px 3px 3px;
+ border-radius: 0px 3px 3px 3px;
+ -webkit-box-shadow: 0 3px 3px #000000;
+ -moz-box-shadow: 0 3px 3px #000000;
+ box-shadow: 0 3px 3px #000000;
+ display: none;
+ margin: 0;
+ padding: 10px;
+ position: absolute;
+ top: 43px;
+ width: 130px;
+}
+#orblist li{
+ border-bottom:1px solid #aaa;
+ list-style:none;
+}
+.orblink{
+ color: #333333;
+ display: block;
+ font: 12px/100% arial,sans-serif;
+ padding: 5px;
+ text-decoration: none;
+}
+.orblink:hover{
+ background:#eee;
+ color:#333;
+}
+#log_out{
+ -moz-box-shadow:inset 1px 0px 0px 0px #73777b;
+ -webkit-box-shadow:inset 1px 0px 0px 0px #73777b;
+ box-shadow:inset 1px 0px 0px 0px #73777b;
+ border-right:1px solid #41474c;
+ border-left:1px solid #41474c;
+ float:right;
+ width:41px;
+ height:41px;
+}
+#log_out:hover{
+ background:-webkit-gradient( linear, left top, left bottom, color-stop(0, #01afde), color-stop(1, #007ec6) );
+ background:-moz-linear-gradient( center top -90deg, #01afde 0%, #007ec6 100% );
+ filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#01afde', endColorstr='#007ec6');
+}
+#log_out a{
+ background: url(<%= asset_path "service_btn.png" %>) no-repeat scroll right 0 transparent;
+ display: block;
+ height: 41px;
+ text-indent: -9999px;
+ width: 41px;
+}
+#log_out a:hover{
+ background: url(<%= asset_path "service_btn.png" %>) no-repeat scroll right bottom transparent !important;
+}
+.lang{
+ color: #FFFFFF;
+ float: right;
+ font-size: 15px;
+ line-height: 40px;
+ margin-right: 10px;
+}
+.lang a{
+ color:#fff;
+ text-decoration:none;
+}
+.lang a:hover{
+ text-decoration:underline;
+}
+#back_content{
+ height: 100%;
+}
+#back_footer{
+ background-color: #101010;
+ bottom: 0;
+ color: #FFFFFF;
+ display:none;
+ font-size: 11px;
+ padding: 10px;
+ position: fixed;
+ width: 100%;
+ left: 0;
+ box-shadow: 0 -3px 4px #000;
+}
+.items_setup{
+ padding:42px 0 0 0;
+}
+#back_sidebar .items_setup .list li{
+ padding: 6px 0 7px 5px;
+}
+#back_sidebar .items_setup .list li a{
+ display: inline;
+ font-size: 0.9em;
+ padding: 0;
+}
+#back_sidebar .items_setup .list li a span{
+ background:none;
+ padding:0;
+ text-shadow:none;
+}
+.main {
+ background: none repeat scroll 0 0 #FFFFFF;
+ height: 100%;
+ margin-left: 220px;
+ padding: 0 40px;
+ position: relative;
+}
+.main_list {
+ padding-top: 70px;
+}
+.main_list ul {
+ clear:both;
+}
+#porfile {
+ padding-top: 100px;
+}
+/*add_buttom*/
+.button_bar {
+ float: right;
+ -moz-box-shadow:inset 0px 1px 0px 0px #666, 0px 0px 3px black;
+ -webkit-box-shadow:inset 0px 1px 0px 0px #666, 0px 0px 3px black;
+ box-shadow:inset 0px 1px 0px 0px #666, 0px 0px 3px black;
+ background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #4f4f4f), color-stop(1, #000000) );
+ background:-moz-linear-gradient( center top, #4f4f4f 5%, #000000 100% );
+ filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#4f4f4f', endColorstr='#000000');
+ background-color:#4f4f4f;
+ -moz-border-radius:5px;
+ -webkit-border-radius:5px;
+ border-radius:5px;
+ display:inline-block;
+ padding:0;
+ margin:10px 0 60px;
+}
+.button_bar a {
+ text-decoration:none;
+ text-shadow:0px -1px 0px #000000;
+ font-size:12px;
+ color:#EDEDED;
+ border-right:1px solid #555;
+ -moz-box-shadow:1px 0px 0px black;
+ -webkit-box-shadow:1px 0px 0px black;
+ box-shadow:1px 0px 0px black;
+ padding: 6px 10px 4px;
+ display: inline-block;
+ float: left;
+}
+.button_bar a:active {
+ padding: 7px 10px 3px !important;
+ text-shadow:0px 1px 0px #000000;
+ background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #000000), color-stop(1, #4f4f4f) );
+ background:-moz-linear-gradient( center top, #000000 5%, #4f4f4f 100% );
+ filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#000000', endColorstr='#4f4f4f');
+}
+.button_bar a:last-child {
+ border-right:none;
+ -moz-box-shadow:none;
+ -webkit-box-shadow:none;
+ box-shadow:none;
+ -moz-border-radius:0px 5px 5px 0px;
+ -webkit-border-radius:0px 5px 5px 0px;
+ border-radius:0px 5px 5px 0px;
+}
+.button_bar a:first-child {
+ -moz-border-radius:5px 0px 0px 5px;
+ -webkit-border-radius:5px 0px 0px 5px;
+ border-radius:5px 0px 0px 5px;
+}
+.button_bar a.new {
+ padding: 5px 10px;
+ -moz-border-radius:5px;
+ -webkit-border-radius:5px;
+ border-radius:5px;
+}
+.button_bar a:hover {
+ color:#FFFFFF;
+}
+.up {
+ margin:10px 0;
+}
+#person {
+ left: 245px;
+ position: fixed;
+ text-align: center;
+ top: 75px;
+ width: 140px;
+ background-color:#FFF;
+ padding:15px;
+ border-radius: 5px;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ -moz-box-shadow: 0px 0px 4px #180902; /* Firefox */
+ -webkit-box-shadow: 0px 0px 4px #180902;/* Safari 和 Chrome */
+ box-shadow: 0px 0px 4px #180902; /* Opera 10.5 + */
+}
+#file {
+ display:none;
+}
+#person img {
+}
+.user_mail {
+ border: medium none;
+ border:1px solid #DDDDDD;
+ color: #666666;
+ font-size: 12px;
+ width: 140px;
+}
+#person label {
+ display: block;
+ margin: 15px 0 0;
+}
+#person label input {
+}
+#person label #user_admin {
+ float:right;
+ margin: 0;
+}
+#person label span {
+ text-align:left;
+ font-size:11px;
+ color:#888;
+ display:block;
+}
+#person select {
+ border: 1px solid #DDDDDD;
+ padding: 0;
+ width: 140px;
+}
+#porfile .users{
+ margin-left: 180px;
+}
+.roles_block {
+ background: url(<%= asset_path "75.png" %>) repeat left top;
+ min-width:710px;
+ margin-bottom:50px;
+ position:relative;
+ padding-bottom: 20px;
+ border-radius: 5px;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ -moz-box-shadow: 0px 0px 4px #180902; /* Firefox */
+ -webkit-box-shadow: 0px 0px 4px #180902;/* Safari 和 Chrome */
+ box-shadow: 0px 0px 4px #180902; /* Opera 10.5 + */
+}
+.roles_block h2 {
+ color: #FFFFFF;
+ font-weight: normal;
+ margin: 0;
+ padding: 0;
+ position: absolute;
+ text-shadow: 0 3px 2px #000000;
+ top: -30px;
+}
+.main hr {
+ height:8px;
+ border:none;
+ margin:0;
+ border-radius: 5px 5px 0px 0px;
+ -moz-border-radius: 5px 5px 0px 0px;
+ -webkit-border-radius: 5px 5px 0px 0px;
+ border-bottom:1px solid #000;
+}
+.main2{
+ padding:70px 0 0;
+}
+#basic_block hr {
+ background-color: #666666;
+}
+#teacher_block hr {
+ background-color: #0071A9;
+}
+#student_block hr {
+ background-color: #AF0045;
+}
+.info_input {
+ padding:10px 20px;
+}
+.info_input table {
+ color:#fff;
+ width:100%;
+ font-size:14px;
+}
+.info_input table td {
+ padding:5px 10px 5px 0;
+ width: 10%;
+}
+.info_input .list_head {
+ background:url(<%= asset_path "line.png" %>) left bottom repeat-x;
+}
+.info_input .list_head td {
+}
+.info_input .list_item {
+ color:#AEAEAE;
+}
+.info_input .add {
+ display:block;
+ padding-left:22px;
+ font-size:12px;
+ line-height:21px;
+ height:19px;
+ background:url(<%= asset_path "icon.png" %>) no-repeat -59px 0;
+ margin-top: 10px;
+ color: #DDDDDD;
+}
+
+.main table {
+ width:100%;
+}
+.main td {
+ padding-left:20px;
+ color:#fff;
+ font-size:14px;
+ line-height:40px;
+}
+.main tr.have td{
+ background: url(<%= asset_path "75.png" %>) repeat left top;
+}
+.main tr.have td:first-child{
+ border-radius: 5px 0 0 5px;
+ -moz-border-radius: 5px 0 0 5px;
+ -webkit-border-radius: 5px 0 0 5px;
+}
+.main tr.have td:last-child{
+ border-radius: 0 5px 5px 0;
+ -moz-border-radius: 0 5px 5px 0;
+ -webkit-border-radius: 0 5px 5px 0;
+}
+.main thead td {
+ line-height:40px;
+ font-size:16px;
+ text-shadow: 0px 1px 1px #3e2914;
+}
+.main thead td.action {
+ width:140px;
+}
+.main tbody td.roles {
+ background-image: url(<%= asset_path "roles_type.jpg" %>);
+ background-repeat: repeat-x;
+}
+.main tbody td.teacher {
+ background-position: 0 -54px;
+}
+.main tbody td.student {
+ background-position: 0 -5px;
+}
+.main tbody td.action a {
+ background-image: url(<%= asset_path "icon.png" %>);
+ display: inline-block;
+ height: 19px;
+ margin-right: 10px;
+ top: 8px;
+ text-indent: -9999px;
+ width: 19px;
+ position: relative;
+}
+.main tbody td.action a.show {
+ background-position: left top;
+}
+.main tbody td.action a.show:hover {
+ background-position: left -19px;
+}
+.main tbody td.action a.edit {
+ background-position: -19px top;
+}
+.main tbody td.action a.edit:hover {
+ background-position: -19px -19px;
+}
+.main tbody td.action a.delete {
+ background-position: -38px top;
+}
+.main tbody td.action a.delete:hover {
+ background-position: -38px -19px;
+}
+.main tbody td.action a.switch {
+ background: url(<%= asset_path "switch.png" %>) no-repeat left 3px;
+ width: 40px;
+}
+.main tbody tr.disable td.action a.switch {
+ background-position:left bottom;
+}
+.main tbody td.action a.delete:hover {
+ background-position: -38px -19px;
+}
+.main tbody tr.have {
+}
+.main tbody tr.disable {
+ opacity: 0.7;
+}
+.main tbody tr {
+ background:none;
+ height:15px;
+}
+h1{
+ margin:0 0 20px;
+}
+p{
+ margin:0 0 10px;
+}
+
+#back_sidebar .items_setup .list li{
+ background:url(<%= asset_path "sidebar_li2.jpg" %>) repeat left top;
+ border:none;
+ padding: 0 0 0 5px;
+}
+#back_sidebar .items_setup .list li a{
+ line-height:31px;
+}
+#back_sidebar .items_setup .list li:hover{
+ background:url(<%= asset_path "sidebar_li2.jpg" %>) repeat left top;
+ border:none;
+}
+#back_sidebar .items_setup ul .list {
}
\ No newline at end of file
diff --git a/app/assets/stylesheets/style.css.erb b/app/assets/stylesheets/style.css.erb
index beae5a8e..d2e33b04 100644
--- a/app/assets/stylesheets/style.css.erb
+++ b/app/assets/stylesheets/style.css.erb
@@ -1,830 +1,873 @@
-@font-face{
- font-family: 'WebSymbolsRegular';
- src: url(<%= asset_path 'websymbols-regular-webfont.eot' %>);
- src: url(<%= asset_path 'websymbols-regular-webfont.eot?#iefix' %>) format('embedded-opentype'),
- url(<%= asset_path 'websymbols-regular-webfont.woff' %>) format('woff'),
- url(<%= asset_path 'websymbols-regular-webfont.ttf' %>) format('truetype'),
- url(<%= asset_path 'websymbols-regular-webfont.svg#WebSymbolsRegular' %>) format('svg');
-}
-.login-logo {
- text-indent: -9999px;
- background: url(<%= asset_path 'sign-in-logo.png' %>) no-repeat center 40px;
- padding-top: 40px;
- height: 160px;
-}
-#orbit-bar {
- margin-bottom: 0;
- position:fixed;
- width:100%;
- z-index: 99;
- top: 0;
- left: 0;
-}
-#orbit-bar .navbar-inner {
- height: 28px;
- -moz-border-radius: 0px;
- -webkit-border-radius: 0px;
- border-radius: 0px;
- padding-top: 2px;
- padding-bottom: 1px;
- -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.8), inset 0 1px 0 rgba(127, 149, 165, 1), 0 -1px 0 rgba(31, 32, 36, 1) inset;
- -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.8), inset 0 1px 0 rgba(127, 149, 165, 1), 0 -1px 0 rgba(31, 32, 36, 1) inset;
- box-shadow: 0 1px 3px rgba(0, 0, 0, 0.8), inset 0 1px 0 rgba(127, 149, 165, 1), 0 -1px 0 rgba(31, 32, 36, 1) inset;
-
- background-image: -moz-linear-gradient(top, #5282A6, #133757);
- background-image: -ms-linear-gradient(top, #5282A6, #133757);
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5282A6), to(#133757));
- background-image: -webkit-linear-gradient(top, #5282A6, #133757);
- background-image: -o-linear-gradient(top, #5282A6, #133757);
- background-image: linear-gradient(top, #5282A6, #133757);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5282A6', endColorstr='#133757', GradientType=0);
- /*
- background-image: -moz-linear-gradient(top, #545b60, #191a1c);
- background-image: -ms-linear-gradient(top, #545b60, #191a1c);
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#545b60), to(#191a1c));
- background-image: -webkit-linear-gradient(top, #545b60, #191a1c);
- background-image: -o-linear-gradient(top, #545b60, #191a1c);
- background-image: linear-gradient(top, #545b60, #191a1c);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#545b60', endColorstr='#191a1c', GradientType=0);
- */
-}
-#orbit-bar .navbar-search {
- float: none;
- margin: 0 auto;
- text-align: center;
-}
-#orbit-bar .nav.pull-right {
- margin-right: -20px;
-}
-#orbit-bar .search-query {
- background-image: url(<%= asset_path 'main-search.png' %>);
- background-repeat: no-repeat;
- background-position: 5px 6px;
- padding-left: 25px;
- /*background-color: rgba(255, 255, 255, 0.8);
- color: #333;
- text-shadow: 0px 1px 0px #FFF;*/
- box-shadow: 0 1px 1px rgba(0, 0, 0, 0.3) inset, 0 1px 0 rgba(255, 255, 255, 0.15);
-}
-#orbit-bar .search-query:focus {
- /*background-color: rgba(255, 255, 255, 0.9);
- text-shadow: 0px 1px 0px #FFF;*/
- background-position: 6px 7px;
-}
-#orbit-bar .container {
- width:100%;
-}
-#orbit-bar .orbit-logo .brand {
- /* background: url(<%= asset_path 'orbit-bar.png' %>) no-repeat -162px -5px; */
- background: url(<%= asset_path 'nccu_logo.png' %>) no-repeat 6px 0px;
- text-indent:-9999px;
- padding: 5px 20px 4px;
-}
-#orbit-bar .orbit-logo .brand:hover {
- background-color: rgba(0,157,220,1);
-}
-#orbit-bar .orbit-logo.open .brand {
- background-color: rgba(0,157,220,1);
-}
-#orbit-bar .orbit-logo .dropdown-menu {
- left: -15px;
-}
-#orbit-bar .nav > li {
- height: 28px;
-}
-#orbit-bar .nav > li > a:hover {
- background-color: rgba(0,157,220,1);
-}
-#orbit-bar .nav > li > a {
- background-image: url(<%= asset_path 'orbit-bar.png' %>);
- background-repeat:no-repeat;
- display: inline-block;
- width: 16px;
- height: 16px;
- text-indent: -9999px;
- padding:6px;
-}
-#orbit-bar .nav > li > a.orbit-bar-home {
- background-position: -10px -10px;
-}
-#orbit-bar .nav > li > a.orbit-bar-desktop {
- background-position: -100px -4px;
-}
-#orbit-bar .nav > li > a.orbit-bar-member {
- background-position: -4px -37px;
-}
-#orbit-bar .nav > li > a.orbit-bar-member {
- background-position: -10px -43px;
-}
-#orbit-bar .nav > li > a.orbit-bar-language {
- background-position: -42px -42px;
-}
-.language-menu .active {
- color: #ffffff;
- text-decoration: none;
- background-color: #0088cc;
-}
-#orbit-bar .nav > li > a.orbit-bar-account {
- background-image: none;
- height: 22px;
- padding: 3px;
- text-indent: inherit;
- min-width: 110px;
- width: auto !important;
- text-align: left;
-}
-#orbit-bar .nav span.member-name {
- display: inline-block;
- line-height: 22px;
- padding: 0 10px;
-}
-#orbit-bar .nav img.member-img {
- display: inline-block;
- float: left;
- max-width: 22px;
-}
-#orbit-bar .account-menu {
- right: 5px;
-}
-#orbit-bar .bar-login {
-
-}
-#orbit-bar .bar-login .open, #orbit-bar .open .orbit-bar-account {
- background-color: #009DDC;
-}
-#orbit-bar .bar-login .dropdown-menu {
- padding: 0 0 10px;
- max-width: 260px;
-}
-#orbit-bar .bar-login .dropdown-menu .log {
- margin: 10px 15px 0;
- list-style: none outside none;
-}
-#orbit-bar .bar-login .dropdown-menu .log .title {
- background: url(<%= asset_path 'sign-in-logo2.png' %>) no-repeat center center;
- height: 70px;
-}
-#orbit-bar .bar-login .dropdown-menu .log form {
- margin: 0 0 8px;
-}
-#orbit-bar .bar-login .dropdown-menu .log input {
- display: inline-block;
- margin: 0;
-}
-#orbit-bar .bar-login .dropdown-menu .log .span2 {
- width: 183px;
-}
-#orbit-bar .bar-login .dropdown-menu .log .forgot {
- margin-bottom: 20px;
- padding: 3px 0 0;
- float: right;
- display: inline-block;
- color: #0088CC;
-}
-#orbit-bar .bar-login .dropdown-menu .log .input-prepend {
- margin-top: 20px;
-}
-#orbit-bar .bar-login .dropdown-menu .log .remember {
- margin-top: 5px;
-}
-#orbit-bar .bar-login .dropdown-menu .log .forgot:hover {
- padding: 3px 0 0;
- float: right;
- display: inline-block;
- color: #005580;
- text-decoration: underline;
- background-color: transparent;
-}
-#orbit-bar .bar-login .dropdown-menu .log .btn {
- width: 220px;
-}
-#orbit-bar .bar-login .dropdown-menu .log .divider {
- position:relative;
- overflow: inherit;
- margin: 20px 0;
-}
-#orbit-bar .bar-login .dropdown-menu .log .divider span {
- position: absolute;
- width: 20px;
- height: 20px;
- background-color: #FFF;
- color: #666;
- top: -9px;
- left: 100px;
- font-size:16px;
- text-align: center;
-}
-#orbit-bar .bar-login .dropdown-menu .register {
- color: #FFFFFF;
- margin: 0 15px;
- width: 188px;
-}
-#main-sidebar {
- background: url(<%= asset_path 'background.jpg' %>) repeat left top;
- width: 155px;
- padding-right: 4px;
- border-right: 1px solid rgba(0,0,0,.2);
- position:fixed;
- top: 32px;
- z-index: 88;
-}
-#main-sidebar .nav {
- padding-top: 5px;
-}
-#main-sidebar .nav > li.active > a [class^="icons-"] {
- background-image: url(<%= asset_path 'icons_pack_white.png' %>);
-}
-#main-sidebar .nav > li > .nav {
- margin-left: -14px;
- margin-bottom: 5px;
- width: 155px;
- padding: 0;
- background-color: #FFF;
- /*border-radius: 0px 0px 8px 0px;
- -webkit-border-radius: 0px 0px 8px 0px;
- -moz-border-radius: 0px 0px 8px 0px;*/
- box-shadow: 0px 2px 1px rgba(0,0,0,0.1);
- -moz-box-shadow: 0px 2px 1px rgba(0,0,0,0.1);
- -webkit-box-shadow: 0px 2px 1px rgba(0,0,0,0.1);
-}
-#main-sidebar .nav > li > .nav > li > a {
- margin-left: 0;
- padding-left: 19px;
- color: #999;
-}
-#main-sidebar .nav > li > .nav > li > a:hover {
- color: #000;
- background-color: #d7eeff;
-}
-#main-sidebar .nav > li > .nav > li.active > a {
- background-color: #b7b7b7;
- color: #fff;
-}
-#main-wrap {
- background-color: #FFF;
- margin-left:160px;
- padding-top: 32px;
- padding-bottom: 18px;
- position: relative;
- min-height: 100%;
-}
-#main-wrap > .form-actions {
- background-color: #FFF;
- text-align: center;
- padding: 17px 20px 0;
- margin: 0;
- border-top: none;
-}
-#main-wrap .subnav {
- height: auto;
- min-height: 36px;
-}
-#main-wrap .pagination {
- margin: 18px 0 0;
- text-align: center;
-}
-.main-list .route-group td {
- border: none;
-}
-#main-wrap .route-group .breadcrumb {
- background-image: none;
- border-radius: 0;
- -moz-border-radius: 0;
- -webkit-border-radius: 0;
- border-width: 0 0 1px 0;
- box-shadow: none;
- -webkit-box-shadow: none;
- -moz-box-shadow: none;
- margin-bottom: 0px;
- padding: 7px 8px 5px;
-}
-#main-wrap .breadcrumb li {
- font-size: 12px;
- color: #999;
-}
-#sub-wiget {
- clear: right;
- float: right;
- padding-right: 10px;
- padding-top: 8px;
- position: relative;
- margin-bottom: 13px;
- width: 304px;
-}
-.main-wiget .widget-box {
- margin: 5px 0;
- width: 100%;
-}
-#poststuff .form-actions {
- background-color: transparent;
- text-align: right;
- padding-left: 10px;
- padding-right: 10px;
- margin-bottom: 0;
- clear: both;
-}
-#poststuff form {
- margin-bottom: 0;
-}
-#post-body {
- float: left;
- clear: left;
- width: 100%;
- margin-right: -340px;
-}
-#post-body .title input[type=text] {
- margin-bottom: 0;
- width: 100%;
- height: 30px;
-}
-#post-body .btn-group {
- margin-left: 5px;
-}
-#post-body .well {
- margin: 0;
- border-radius: 0px;
- -moz-border-radius: 0px;
- box-shadow: none;
- -moz-box-shadow: none;
- -webkit-box-shadow: none;
- border-top: none;
-}
-#post-body .editor {
- background-color: #333333;
- height: 20px;
- margin: 8px 0;
- width: 100%;
-}
-#post-body-content {
- margin-right: 320px;
- padding: 8px 0 8px 6px;
-}
-.filter .accordion-heading > a:hover {
- text-decoration: none;
-}
-.filter .accordion-group {
- border-bottom: none;
- border-top: none;
- border-left: 1px solid rgba(0,0,0,0.07);
- border-right: none;
- -moz-border-radius: 0;
- -webkit-border-radius: 0;
- border-radius: 0;
- margin-bottom: -1px;
- position: relative;
- left: 0;
- top: 0;
-}
-.filter .accordion-group:last-child {
- border-right: 1px solid rgba(0,0,0,0.07);
-}
-.filter .accordion-heading .accordion-toggle {
- padding: 9px 15px;
-}
-.accordion-group .accordion-toggle .caret {
- border-top-color: #0088CC;
- margin-top: 6px;
-}
-.filter .active {
- background-color: #0088CC;
-}
-.filter .active a {
- color: #FFF;
-}
-.filters {
- background-color: rgba(0,0,0,0.075);
- -webkit-box-shadow: inset 0 2px 3px rgba(0, 0, 0, 0.2);
- -moz-box-shadow: inset 0 2px 3px rgba(0, 0, 0, 0.2);
- box-shadow: inset 0 2px 3px rgba(0, 0, 0, 0.2);
-}
-.filters > div {
- background-color: #dadada;
-}
-.filters .btn {
- margin-bottom: 5px;
-}
-.filters .accordion-inner {
- border-top: none;
- padding: 9px 15px 4px;
-}
-.filters .filter-clear {
- padding: 5px 5px 0;
- border-top: 1px solid rgba(0,0,0,0.1);
- text-align: right;
- margin: 0 5px;
- -webkit-box-shadow: inset 0 1px 0px rgba(255, 255, 255, 0.5);
- -moz-box-shadow: inset 0 1px 0px rgba(255, 255, 255, 0.5);
- box-shadow: inset 0 1px 0px rgba(255, 255, 255, 0.5);
-}
-.filters .in {
- /*border-bottom: 1px solid rgba(0,0,0,0.07)*/
-}
-.sign-in {
- width: 360px;
- margin: 0 auto 70px;
- background-color: #FFF;
- -moz-border-radius: 0 0 5px 5px;
- -webkit-border-radius: 0 0 5px 5px;
- border-radius: 0 0 5px 5px;
- -moz-box-shadow: 0 2px 2px rgba(143, 143, 143, 0.38);
- -webkit-box-shadow: 0 2px 2px rgba(143, 143, 143, 0.38);
- box-shadow: 0 2px 2px rgba(143, 143, 143, 0.38);
- border-width: 0px 1px 1px 1px;
- border-style: none solid solid solid;
- border-color: transparent #c6c6c6 #c6c6c6 #c6c6c6;
-}
-#signin-header {
- width: 340px;
- margin: 30px auto 0;
- line-height: 25px;
- padding: 5px 10px;
- border-width: 1px 1px 0px 1px;
- border-style: solid solid none solid;
- border-color: #c6c6c6 #c6c6c6 transparent #c6c6c6;
- background-color: #006dcc;
- background-image: -moz-linear-gradient(top, #dadada, #c0c0c0);
- background-image: -ms-linear-gradient(top, #dadada, #c0c0c0);
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#dadada), to(#c0c0c0));
- background-image: -webkit-linear-gradient(top, #dadada, #c0c0c0);
- background-image: -o-linear-gradient(top, #dadada, #c0c0c0);
- background-image: linear-gradient(top, #dadada, #c0c0c0);
- -moz-border-radius: 5px 5px 0px 0px ;
- -webkit-border-radius: 5px 5px 0px 0px;
- border-radius: 5px 5px 0px 0px;
- -moz-box-shadow: 0 1px 0px rgba(20, 20, 20, 0.3);
- -webkit-box-shadow: 0 1px 0px rgba(20, 20, 20, 0.3);
- box-shadow: 0 1px 0px rgba(20, 20, 20, 0.3);
-}
-#signin-header h3 {
- color: #848484;
- text-shadow: 0 1px 0 #e9e9e9;
-}
-#sign-footer {
- width: 100%;
- position:fixed;
- bottom: 0;
- height: 40px;
- background-color: #dadada;
- color: #7a7a7a;
- box-shadow: 0 -1px 3px rgba(0, 0, 0, 0.3);
- -moz-box-shadow: 0 -1px 3px rgba(0, 0, 0, 0.3);
- -webkit-box-shadow: 0 -1px 3px rgba(0, 0, 0, 0.3);
-}
-#sign-footer p {
- line-height: 40px;
- padding: 0 10px;
- text-align: right;
-}
-.sign-in .control-group label {
- text-align: left;
- width: auto;
- font-size: 15px;
-}
-.sign-in .forgot {
- padding-top: 5px;
-}
-.sign-in .content {
- padding: 10px;
-}
-.sign-in .form-actions {
- padding: 17px 10px 18px;
- margin: 0;
- -moz-border-radius: 0px 0px 5px 5px;
- -webkit-border-radius: 0px 0px 5px 5px;
- border-radius: 0px 0px 5px 5px;
-}
-.sign-in form {
- margin: 0;
-}
-.sign-in .control-group .help-inline {
- display:none;
-}
-.sign-in .error .help-inline {
- display:inline-block;
-}
-.web-symbol:after {
- font-family: 'WebSymbolsRegular';
- content: "{";
- margin-left: 2px;
- margin-top: 8px;
-}
-.active .web-symbol:after {
- content: "}";
-}
-/*icons*/
-.the-icons i:after {
- content: attr(class);
- display: block;
- font-style: normal;
- margin-left: 20px;
- width: 140px;
-}
-.the-icons i {
- display: block;
- margin-bottom: 5px;
-}
-[class^="text-"] {
- font-size: 15px !important;
-}
-.text-blue {
- color: #0088CC !important;
-}
-.text-red {
- color: #CC3300 !important;
-}
-.text-yellow {
- color: #ffcc00 !important;
-}
-.text-orange {
- color: #f7941d !important;
-}
-.text-purple {
- color: #a864a8 !important;
-}
-.text-palm {
- color: #a67c52 !important;
-}
-.text-green {
- color: #39b54a !important;
-}
-[class^="icons-"] {
- display: inline-block;
- width: 16px;
- height: 16px;
- vertical-align: text-top;
- background-image: url(<%= asset_path 'icons_pack.png' %>);
- background-position: 16px 16px;
- background-repeat: no-repeat;
- *margin-right: .3em;
- margin-right:10px;
-}
-[class^="icons-"]:last-child {
- *margin-left: 0;
-}
-.icons-white {
- background-image: url(<%= asset_path 'icons_pack_white.png' %>);
-}
-/*1*/
-.icons-pencil {
- background-position: 0 0;
-}
-.icons-brush {
- background-position: -32px 0;
-}
-.icons-pen {
- background-position: -64px 0;
-}
-.icons-brush-large {
- background-position: -128px 0;
-}
-.icons-pen-small {
- background-position: -96px 0;
-}
-.icons-bucket {
- background-position: -160px 0;
-}
-.icons-eye {
- background-position: -192px 0;
-}
-.icons-ban {
- background-position: -224px 0;
-}
-.icons-trash {
- background-position: -256px 0;
-}
-.icons-zoom {
- background-position: -288px 0;
-}
-.icons-zoom-out {
- background-position: -320px 0;
-}
-.icons-zoom-in {
- background-position: -352px 0;
-}
-.icons-magic {
- background-position: -384px 0;
-}
-.icons-aim {
- background-position: -416px 0;
-}
-/*2*/
-.icons-flag {
- background-position: 0 -32px;
-}
-.icons-paperclip {
- background-position: -32px -32px;
-}
-.icons-share {
- background-position: -64px -32px;
-}
-.icons-link {
- background-position: -96px -32px;
-}
-.icons-tag {
- background-position: -128px -32px;
-}
-.icons-lock {
- background-position: -160px -32px;
-}
-.icons-unlock {
- background-position: -192px -32px;
-}
-/*3*/
-.icons-content {
- background-position: -160px -66px;
-}
-.icons-announcement {
- background-position: -576px -64px;
-}
-/*4*/
-.icons-contact {
- background-position: 0 -96px;
-}
-.icons-roll {
- background-position: -32px -96px;
-}
-.icons-member {
- background-position: -288px -96px;
-}
-.icons-member-user {
- background-position: -64px -96px;
-}
-.icons-member-admin {
- background-position: -96px -96px;
-}
-.icons-member-manager{
- background-position: -128px -96px;
-}
-.icons-member-plus{
- background-position: -160px -96px;
-}
-.icons-member-minus{
- background-position: -192px -96px;
-}
-.icons-member-blockade{
- background-position: -224px -96px;
-}
-.icons-carte {
- background-position: -256px -96px;
-}
-.icons-building {
- background-position: -320px -96px;
-}
-.icons-calendar {
- background-position: -352px -96px;
-}
-.icons-calendars {
- background-position: -384px -96px;
-}
-.icons-out {
- background-position: -416px -96px;
-}
-.icons-desktop {
- background-position: -448px -96px;
-}
-/*5*/
-.icons-page-blank {
- background-position: 0px -128px;
-}
-.icons-page {
- background-position: -32px -128px;
-}
-.icons-page-copy {
- background-position: -64px -128px;
-}
-.icons- {
- background-position: -0px -128px;
-}
-/*6*/
-.icons-globe {
- background-position: -96px -160px;
-}
-.icons-structure {
- background-position: -352px -160px;
-}
-/*7*/
-.icons-purchase {
- background-position: -64px -192px;
-}
-/*8*/
-.icons-dashboard {
- background-position: 0 -224px;
-}
-.icons-cog {
- background-position: -32px -224px;
-}
-.icons-cogs {
- background-position: -64px -224px;
-}
-.icons-tool {
- background-position: -96px -224px;
-}
-.icons-screwdriver {
- background-position: -128px -224px;
-}
-.icons-wrench {
- background-position: -160px -224px;
-}
-.icons-toolbox {
- background-position: -192px -224px;
-}
-.icons-switch {
- background-position: -224px -224px;
-}
-.icons-valve {
- background-position: -256px -224px;
-}
-/*9*/
-.icons-picture {
- background-position: -256px -256px;
-}
-.icons-asset {
- background-position: -384px -256px;
-}
-.icons-asset-upload {
- background-position: -448px -256px;
-}
-.icons-asset-download {
- background-position: -416px -256px;
-}
-/*10*/
-.icons- {
- background-position: -0px -288px;
-}
-/*11*/
-.icons-pie {
- background-position: 0px -320px;
-}
-.icons-histogram {
- background-position: -32px -320px;
-}
-.icons-window {
- background-position: -64px -320px;
-}
-.icons-window-line{
- background-position: -96px -320px;
-}
-.icons-window-command{
- background-position: -128px -320px;
-}
-.icons-window-list{
- background-position: -160px -320px;
-}
-.icons-window-block{
- background-position: -192px -320px;
-}
-.icons-terminal{
- background-position: -224px -320px;
-}
-/*12*/
-.icons-star-thin {
- background-position: -416px -352px;
-}
-.icons- {
- background-position: -0px -352px;
-}
-/*13*/
-.icons- {
- background-position: -0px -384px;
-}
-/*14*/
-.icons- {
- background-position: -0px -416px;
-}
-/*15*/
-.icons- {
- background-position: -0px -448px;
-}
-/*16*/
-.icons- {
- background-position: -0px -480px;
-}
-/*17*/
-.icons- {
- background-position: -0px -512px;
-}
-/*18*/
-.icons-help {
- background-position: -160px -544px;
-}
-.icons- {
- background-position: -0px -544px;
-}
-/*19*/
-.icons-plus-cube {
- background-position: -192px -576px;
-}
-.icons-plus {
- background-position: -288px -576px;
-}
-.icons-power {
- background-position: -0px -608px;
-}
-/*20*/
-.icons- {
- background-position: -0px -608px;
-}
-/*21*/
-.icons- {
- background-position: -0px -640px;
+@font-face{
+ font-family: 'WebSymbolsRegular';
+ src: url(<%= asset_path 'websymbols-regular-webfont.eot' %>);
+ src: url(<%= asset_path 'websymbols-regular-webfont.eot?#iefix' %>) format('embedded-opentype'),
+ url(<%= asset_path 'websymbols-regular-webfont.woff' %>) format('woff'),
+ url(<%= asset_path 'websymbols-regular-webfont.ttf' %>) format('truetype'),
+ url(<%= asset_path 'websymbols-regular-webfont.svg#WebSymbolsRegular' %>) format('svg');
+}
+.login-logo {
+ text-indent: -9999px;
+ background: url(<%= asset_path 'sign-in-logo.png' %>) no-repeat center 40px;
+ padding-top: 40px;
+ height: 160px;
+}
+#orbit-bar {
+ margin-bottom: 0;
+ position:fixed;
+ width:100%;
+ z-index: 99;
+ top: 0;
+ left: 0;
+}
+#orbit-bar .navbar-inner {
+ height: 28px;
+ -moz-border-radius: 0px;
+ -webkit-border-radius: 0px;
+ border-radius: 0px;
+ padding-top: 2px;
+ padding-bottom: 1px;
+ -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.8), inset 0 1px 0 rgba(127, 149, 165, 1), 0 -1px 0 rgba(31, 32, 36, 1) inset;
+ -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.8), inset 0 1px 0 rgba(127, 149, 165, 1), 0 -1px 0 rgba(31, 32, 36, 1) inset;
+ box-shadow: 0 1px 3px rgba(0, 0, 0, 0.8), inset 0 1px 0 rgba(127, 149, 165, 1), 0 -1px 0 rgba(31, 32, 36, 1) inset;
+
+ background-image: -moz-linear-gradient(top, #5282A6, #133757);
+ background-image: -ms-linear-gradient(top, #5282A6, #133757);
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5282A6), to(#133757));
+ background-image: -webkit-linear-gradient(top, #5282A6, #133757);
+ background-image: -o-linear-gradient(top, #5282A6, #133757);
+ background-image: linear-gradient(top, #5282A6, #133757);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5282A6', endColorstr='#133757', GradientType=0);
+ /*
+ background-image: -moz-linear-gradient(top, #545b60, #191a1c);
+ background-image: -ms-linear-gradient(top, #545b60, #191a1c);
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#545b60), to(#191a1c));
+ background-image: -webkit-linear-gradient(top, #545b60, #191a1c);
+ background-image: -o-linear-gradient(top, #545b60, #191a1c);
+ background-image: linear-gradient(top, #545b60, #191a1c);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#545b60', endColorstr='#191a1c', GradientType=0);
+ */
+}
+#orbit-bar .navbar-search {
+ left: 28px;
+ margin: 0;
+ position: absolute;
+ text-align: right;
+ top: -1px;
+}
+#orbit-bar .nav.pull-right {
+ margin-right: -20px;
+}
+#orbit-bar .search-query {
+ padding: 4px 9px;
+ height: 12px;
+ margin-top: 3px;
+ border: 1px solid #333333;
+ font-size: 11px;
+ /*background-color: rgba(255, 255, 255, 0.8);
+ color: #333;
+ text-shadow: 0px 1px 0px #FFF;*/
+ box-shadow: 0 1px 1px rgba(0, 0, 0, 0.3) inset, 0 1px 0 rgba(255, 255, 255, 0.15);
+}
+#orbit-bar .search-query:focus {
+ /*background-color: rgba(255, 255, 255, 0.9);
+ text-shadow: 0px 1px 0px #FFF;*/
+ background-position: 5px 2px;
+}
+#orbit-bar .container {
+ width:100%;
+}
+#orbit-bar .orbit-logo .brand {
+ /* background: url(<%= asset_path 'orbit-bar.png' %>) no-repeat -162px -5px; */
+ background: url(<%= asset_path 'nccu_logo.png' %>) no-repeat 6px 0px;
+ text-indent:-9999px;
+ padding: 5px 20px 4px;
+}
+#orbit-bar .orbit-logo .brand:hover {
+ background-color: rgba(0,157,220,1);
+}
+#orbit-bar .orbit-logo.open .brand {
+ background-color: rgba(0,157,220,1);
+}
+#orbit-bar .orbit-logo .dropdown-menu {
+ left: -15px;
+}
+#orbit-bar .nav > li {
+ height: 28px;
+}
+#orbit-bar .nav > li > a:hover {
+ background-color: rgba(0,157,220,1);
+}
+#orbit-bar .nav > li > a {
+ background-image: url(<%= asset_path 'orbit-bar.png' %>);
+ background-repeat:no-repeat;
+ display: inline-block;
+ width: 16px;
+ height: 16px;
+ text-indent: -9999px;
+ padding:6px;
+}
+#orbit-bar .nav > li.search {
+ overflow: hidden;
+ width: 28px;
+ position: relative;
+}
+#orbit-bar .nav > li > a.orbit-bar-home {
+ background-position: -10px -10px;
+}
+#orbit-bar .nav > li > a.orbit-bar-desktop {
+ background-position: -106px -9px;
+}
+#orbit-bar .nav > li > a.orbit-bar-member {
+ background-position: -4px -37px;
+}
+#orbit-bar .nav > li > a.orbit-bar-member {
+ background-position: -10px -43px;
+}
+#orbit-bar .nav > li > a.orbit-bar-language {
+ background-position: -42px -42px;
+}
+#orbit-bar .nav > li > a.orbit-bar-search {
+ background-position: -75px -10px;
+ overflow: hidden;
+}
+.language-menu .active {
+ color: #ffffff;
+ text-decoration: none;
+ background-color: #0088cc;
+}
+#orbit-bar .nav > li > a.orbit-bar-account {
+ background-image: none;
+ height: 22px;
+ padding: 3px;
+ text-indent: inherit;
+ min-width: 110px;
+ width: auto !important;
+ text-align: left;
+}
+#orbit-bar .nav span.member-name {
+ display: inline-block;
+ line-height: 22px;
+ padding: 0 10px;
+}
+#orbit-bar .nav img.member-img {
+ display: inline-block;
+ float: left;
+ max-width: 22px;
+}
+#orbit-bar .clear {
+ clear: none;
+}
+#orbit-bar .account-menu {
+ right: 5px;
+}
+#orbit-bar .bar-login {
+
+}
+#orbit-bar .bar-login .open, #orbit-bar .open .orbit-bar-account {
+ background-color: #009DDC;
+}
+#orbit-bar .bar-login .dropdown-menu {
+ padding: 0 0 10px;
+ max-width: 260px;
+}
+#orbit-bar .bar-login .dropdown-menu .log {
+ margin: 10px 15px 0;
+ list-style: none outside none;
+}
+#orbit-bar .bar-login .dropdown-menu .log .title {
+ background: url(<%= asset_path 'sign-in-logo2.png' %>) no-repeat center center;
+ height: 70px;
+}
+#orbit-bar .bar-login .dropdown-menu .log form {
+ margin: 0 0 8px;
+}
+#orbit-bar .bar-login .dropdown-menu .log input {
+ display: inline-block;
+ margin: 0;
+}
+#orbit-bar .bar-login .dropdown-menu .log .span2 {
+ width: 183px;
+}
+#orbit-bar .bar-login .dropdown-menu .log .forgot {
+ margin-bottom: 20px;
+ padding: 3px 0 0;
+ float: right;
+ display: inline-block;
+ color: #0088CC;
+}
+#orbit-bar .bar-login .dropdown-menu .log .input-prepend {
+ margin-top: 20px;
+}
+#orbit-bar .bar-login .dropdown-menu .log .remember {
+ margin-top: 5px;
+}
+#orbit-bar .bar-login .dropdown-menu .log .forgot:hover {
+ padding: 3px 0 0;
+ float: right;
+ display: inline-block;
+ color: #005580;
+ text-decoration: underline;
+ background-color: transparent;
+}
+#orbit-bar .bar-login .dropdown-menu .log .btn {
+ width: 220px;
+}
+#orbit-bar .bar-login .dropdown-menu .log .divider {
+ position:relative;
+ overflow: inherit;
+ margin: 20px 0;
+}
+#orbit-bar .bar-login .dropdown-menu .log .divider span {
+ position: absolute;
+ width: 20px;
+ height: 20px;
+ background-color: #FFF;
+ color: #666;
+ top: -9px;
+ left: 100px;
+ font-size:16px;
+ text-align: center;
+}
+#orbit-bar .bar-login .dropdown-menu .register {
+ color: #FFFFFF;
+ margin: 0 15px;
+ width: 188px;
+}
+#main-sidebar {
+ background: url(<%= asset_path 'background.jpg' %>) repeat left top;
+ width: 155px;
+ padding-right: 4px;
+ border-right: 1px solid rgba(0,0,0,.2);
+ position:fixed;
+ top: 32px;
+ z-index: 88;
+}
+#main-sidebar .nav {
+ padding-top: 5px;
+}
+#main-sidebar .nav > li.active > a [class^="icons-"] {
+ background-image: url(<%= asset_path 'icons_pack_white.png' %>);
+}
+#main-sidebar .nav > li > .nav {
+ margin-left: -14px;
+ margin-bottom: 5px;
+ width: 155px;
+ padding: 0;
+ background-color: #FFF;
+ /*border-radius: 0px 0px 8px 0px;
+ -webkit-border-radius: 0px 0px 8px 0px;
+ -moz-border-radius: 0px 0px 8px 0px;*/
+ box-shadow: 0px 2px 1px rgba(0,0,0,0.1);
+ -moz-box-shadow: 0px 2px 1px rgba(0,0,0,0.1);
+ -webkit-box-shadow: 0px 2px 1px rgba(0,0,0,0.1);
+}
+#main-sidebar .nav > li > .nav > li > a {
+ margin-left: 0;
+ padding-left: 19px;
+ color: #999;
+}
+#main-sidebar .nav > li > .nav > li > a:hover {
+ color: #000;
+ background-color: #d7eeff;
+}
+#main-sidebar .nav > li > .nav > li.active > a {
+ background-color: #b7b7b7;
+ color: #fff;
+}
+#main-wrap {
+ background-color: #FFF;
+ margin-left:160px;
+ padding-top: 32px;
+ padding-bottom: 18px;
+ position: relative;
+ min-height: 100%;
+}
+#main-wrap > .form-actions {
+ background-color: #FFF;
+ text-align: center;
+ padding: 17px 20px 0;
+ margin: 0;
+ border-top: none;
+}
+#main-wrap .subnav {
+ height: auto;
+ min-height: 36px;
+}
+#main-wrap .pagination {
+ margin: 18px 0 0;
+ text-align: center;
+}
+.main-list .route-group td {
+ border: none;
+}
+#main-wrap .route-group .breadcrumb {
+ background-image: none;
+ border-radius: 0;
+ -moz-border-radius: 0;
+ -webkit-border-radius: 0;
+ border-width: 0 0 1px 0;
+ box-shadow: none;
+ -webkit-box-shadow: none;
+ -moz-box-shadow: none;
+ margin-bottom: 0px;
+ padding: 7px 8px 5px;
+}
+#main-wrap .breadcrumb li {
+ font-size: 12px;
+ color: #999;
+}
+#sub-wiget {
+ clear: right;
+ float: right;
+ padding-right: 10px;
+ padding-top: 8px;
+ position: relative;
+ margin-bottom: 13px;
+ width: 304px;
+}
+.main-wiget .widget-box {
+ margin: 5px 0;
+ width: 100%;
+}
+#poststuff .form-actions {
+ background-color: transparent;
+ text-align: right;
+ padding-left: 10px;
+ padding-right: 10px;
+ margin-bottom: 0;
+ clear: both;
+}
+#poststuff form {
+ margin-bottom: 0;
+}
+#post-body {
+ float: left;
+ clear: left;
+ width: 100%;
+ margin-right: -340px;
+}
+#post-body .title input[type=text] {
+ margin-bottom: 0;
+ width: 100%;
+ height: 30px;
+}
+#post-body .btn-group {
+ margin-left: 5px;
+}
+#post-body .well {
+ margin: 0;
+ border-radius: 0px;
+ -moz-border-radius: 0px;
+ box-shadow: none;
+ -moz-box-shadow: none;
+ -webkit-box-shadow: none;
+ border-top: none;
+}
+#post-body .editor {
+}
+#post-body-content {
+ margin-right: 320px;
+ padding: 8px 0 8px 6px;
+}
+.filter .accordion-heading > a:hover {
+ text-decoration: none;
+}
+.filter .accordion-group {
+ border-bottom: none;
+ border-top: none;
+ border-left: 1px solid rgba(0,0,0,0.07);
+ border-right: none;
+ -moz-border-radius: 0;
+ -webkit-border-radius: 0;
+ border-radius: 0;
+ margin-bottom: -1px;
+ position: relative;
+ left: 0;
+ top: 0;
+}
+.filter .accordion-group:last-child {
+ border-right: 1px solid rgba(0,0,0,0.07);
+}
+.filter .accordion-heading .accordion-toggle {
+ padding: 9px 15px;
+}
+.accordion-group .accordion-toggle .caret {
+ border-top-color: #0088CC;
+ margin-top: 6px;
+}
+.filter .active {
+ background-color: #0088CC;
+}
+.filter .active a {
+ color: #FFF;
+}
+.filter form {
+ margin: 5px 10px;
+}
+.filters {
+ background-color: rgba(0,0,0,0.075);
+ -webkit-box-shadow: inset 0 2px 3px rgba(0, 0, 0, 0.2);
+ -moz-box-shadow: inset 0 2px 3px rgba(0, 0, 0, 0.2);
+ box-shadow: inset 0 2px 3px rgba(0, 0, 0, 0.2);
+}
+.filters > div {
+ background-color: #dadada;
+}
+.filters .btn {
+ margin-bottom: 5px;
+}
+.filters .accordion-inner {
+ border-top: none;
+ padding: 9px 15px 4px;
+}
+.filters .filter-clear {
+ padding: 5px 5px 0;
+ border-top: 1px solid rgba(0,0,0,0.1);
+ text-align: right;
+ margin: 0 5px;
+ -webkit-box-shadow: inset 0 1px 0px rgba(255, 255, 255, 0.5);
+ -moz-box-shadow: inset 0 1px 0px rgba(255, 255, 255, 0.5);
+ box-shadow: inset 0 1px 0px rgba(255, 255, 255, 0.5);
+}
+.filters .in {
+ /*border-bottom: 1px solid rgba(0,0,0,0.07)*/
+}
+.sign-in {
+ width: 360px;
+ margin: 0 auto 70px;
+ background-color: #FFF;
+ -moz-border-radius: 0 0 5px 5px;
+ -webkit-border-radius: 0 0 5px 5px;
+ border-radius: 0 0 5px 5px;
+ -moz-box-shadow: 0 2px 2px rgba(143, 143, 143, 0.38);
+ -webkit-box-shadow: 0 2px 2px rgba(143, 143, 143, 0.38);
+ box-shadow: 0 2px 2px rgba(143, 143, 143, 0.38);
+ border-width: 0px 1px 1px 1px;
+ border-style: none solid solid solid;
+ border-color: transparent #c6c6c6 #c6c6c6 #c6c6c6;
+}
+#signin-header {
+ width: 340px;
+ margin: 30px auto 0;
+ line-height: 25px;
+ padding: 5px 10px;
+ border-width: 1px 1px 0px 1px;
+ border-style: solid solid none solid;
+ border-color: #c6c6c6 #c6c6c6 transparent #c6c6c6;
+ background-color: #006dcc;
+ background-image: -moz-linear-gradient(top, #dadada, #c0c0c0);
+ background-image: -ms-linear-gradient(top, #dadada, #c0c0c0);
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#dadada), to(#c0c0c0));
+ background-image: -webkit-linear-gradient(top, #dadada, #c0c0c0);
+ background-image: -o-linear-gradient(top, #dadada, #c0c0c0);
+ background-image: linear-gradient(top, #dadada, #c0c0c0);
+ -moz-border-radius: 5px 5px 0px 0px ;
+ -webkit-border-radius: 5px 5px 0px 0px;
+ border-radius: 5px 5px 0px 0px;
+ -moz-box-shadow: 0 1px 0px rgba(20, 20, 20, 0.3);
+ -webkit-box-shadow: 0 1px 0px rgba(20, 20, 20, 0.3);
+ box-shadow: 0 1px 0px rgba(20, 20, 20, 0.3);
+}
+#signin-header h3 {
+ color: #848484;
+ text-shadow: 0 1px 0 #e9e9e9;
+}
+#sign-footer {
+ width: 100%;
+ position:fixed;
+ bottom: 0;
+ height: 40px;
+ background-color: #dadada;
+ color: #7a7a7a;
+ box-shadow: 0 -1px 3px rgba(0, 0, 0, 0.3);
+ -moz-box-shadow: 0 -1px 3px rgba(0, 0, 0, 0.3);
+ -webkit-box-shadow: 0 -1px 3px rgba(0, 0, 0, 0.3);
+}
+#sign-footer p {
+ line-height: 40px;
+ padding: 0 10px;
+ text-align: right;
+}
+.sign-in .control-group label {
+ text-align: left;
+ width: auto;
+ font-size: 15px;
+}
+.sign-in .forgot {
+ padding-top: 5px;
+}
+.sign-in .content {
+ padding: 10px;
+}
+.sign-in .form-actions {
+ padding: 17px 10px 18px;
+ margin: 0;
+ -moz-border-radius: 0px 0px 5px 5px;
+ -webkit-border-radius: 0px 0px 5px 5px;
+ border-radius: 0px 0px 5px 5px;
+}
+.sign-in form {
+ margin: 0;
+}
+.sign-in .control-group .help-inline {
+ display:none;
+}
+.sign-in .error .help-inline {
+ display:inline-block;
+}
+.web-symbol:after {
+ font-family: 'WebSymbolsRegular';
+ content: "{";
+ margin-left: 2px;
+ margin-top: 8px;
+}
+.active .web-symbol:after {
+ content: "}";
+}
+.img-peview {
+ margin-left: 12px;
+}
+.popover img {
+ max-height: 120px;
+ max-width: 100%;
+}
+.popover-inner {
+ width: auto;
+}
+.popover-title {
+ padding: 5px;
+}
+.popover-content {
+ border-radius: 3px;
+ padding: 5px;
+}
+.popover-title {
+ display: none;
+}
+/*icons*/
+.the-icons i:after {
+ content: attr(class);
+ display: block;
+ font-style: normal;
+ margin-left: 20px;
+ width: 140px;
+}
+.the-icons i {
+ display: block;
+ margin-bottom: 5px;
+}
+[class^="text-"] {
+ font-size: 15px !important;
+}
+.text-blue {
+ color: #0088CC !important;
+}
+.text-red {
+ color: #CC3300 !important;
+}
+.text-yellow {
+ color: #ffcc00 !important;
+}
+.text-orange {
+ color: #f7941d !important;
+}
+.text-purple {
+ color: #a864a8 !important;
+}
+.text-palm {
+ color: #a67c52 !important;
+}
+.text-green {
+ color: #39b54a !important;
+}
+[class^="icons-"] {
+ display: inline-block;
+ width: 16px;
+ height: 16px;
+ vertical-align: text-top;
+ background-image: url(<%= asset_path 'icons_pack.png' %>);
+ background-position: 16px 16px;
+ background-repeat: no-repeat;
+ *margin-right: .3em;
+ margin-right:10px;
+}
+[class^="icons-"]:last-child {
+ *margin-left: 0;
+}
+.icons-white {
+ background-image: url(<%= asset_path 'icons_pack_white.png' %>);
+}
+/*1*/
+.icons-pencil {
+ background-position: 0 0;
+}
+.icons-brush {
+ background-position: -32px 0;
+}
+.icons-pen {
+ background-position: -64px 0;
+}
+.icons-brush-large {
+ background-position: -128px 0;
+}
+.icons-pen-small {
+ background-position: -96px 0;
+}
+.icons-bucket {
+ background-position: -160px 0;
+}
+.icons-eye {
+ background-position: -192px 0;
+}
+.icons-ban {
+ background-position: -224px 0;
+}
+.icons-trash {
+ background-position: -256px 0;
+}
+.icons-zoom {
+ background-position: -288px 0;
+}
+.icons-zoom-out {
+ background-position: -320px 0;
+}
+.icons-zoom-in {
+ background-position: -352px 0;
+}
+.icons-magic {
+ background-position: -384px 0;
+}
+.icons-aim {
+ background-position: -416px 0;
+}
+/*2*/
+.icons-flag {
+ background-position: 0 -32px;
+}
+.icons-paperclip {
+ background-position: -32px -32px;
+}
+.icons-share {
+ background-position: -64px -32px;
+}
+.icons-link {
+ background-position: -96px -32px;
+}
+.icons-tag {
+ background-position: -128px -32px;
+}
+.icons-lock {
+ background-position: -160px -32px;
+}
+.icons-unlock {
+ background-position: -192px -32px;
+}
+.icons-time {
+ background-position: -448px -32px;
+}
+.icons-banner {
+ background-position: -608px -32px;
+}
+/*3*/
+.icons-content {
+ background-position: -160px -66px;
+}
+.icons-announcement {
+ background-position: -576px -64px;
+}
+/*4*/
+.icons-contact {
+ background-position: 0 -96px;
+}
+.icons-roll {
+ background-position: -32px -96px;
+}
+.icons-member {
+ background-position: -288px -96px;
+}
+.icons-member-user {
+ background-position: -64px -96px;
+}
+.icons-member-admin {
+ background-position: -96px -96px;
+}
+.icons-member-manager{
+ background-position: -128px -96px;
+}
+.icons-member-plus{
+ background-position: -160px -96px;
+}
+.icons-member-minus{
+ background-position: -192px -96px;
+}
+.icons-member-blockade{
+ background-position: -224px -96px;
+}
+.icons-carte {
+ background-position: -256px -96px;
+}
+.icons-building {
+ background-position: -320px -96px;
+}
+.icons-calendar {
+ background-position: -352px -96px;
+}
+.icons-calendars {
+ background-position: -384px -96px;
+}
+.icons-out {
+ background-position: -416px -96px;
+}
+.icons-desktop {
+ background-position: -448px -96px;
+}
+/*5*/
+.icons-page-blank {
+ background-position: 0px -128px;
+}
+.icons-page {
+ background-position: -32px -128px;
+}
+.icons-page-copy {
+ background-position: -64px -128px;
+}
+.icons- {
+ background-position: -0px -128px;
+}
+/*6*/
+.icons-globe {
+ background-position: -96px -160px;
+}
+.icons-structure {
+ background-position: -352px -160px;
+}
+/*7*/
+.icons-purchase {
+ background-position: -64px -192px;
+}
+/*8*/
+.icons-dashboard {
+ background-position: 0 -224px;
+}
+.icons-cog {
+ background-position: -32px -224px;
+}
+.icons-cogs {
+ background-position: -64px -224px;
+}
+.icons-tool {
+ background-position: -96px -224px;
+}
+.icons-screwdriver {
+ background-position: -128px -224px;
+}
+.icons-wrench {
+ background-position: -160px -224px;
+}
+.icons-toolbox {
+ background-position: -192px -224px;
+}
+.icons-switch {
+ background-position: -224px -224px;
+}
+.icons-valve {
+ background-position: -256px -224px;
+}
+/*9*/
+.icons-picture {
+ background-position: -256px -256px;
+}
+.icons-asset {
+ background-position: -384px -256px;
+}
+.icons-asset-upload {
+ background-position: -448px -256px;
+}
+.icons-asset-download {
+ background-position: -416px -256px;
+}
+/*10*/
+.icons- {
+ background-position: -0px -288px;
+}
+/*11*/
+.icons-pie {
+ background-position: 0px -320px;
+}
+.icons-histogram {
+ background-position: -32px -320px;
+}
+.icons-window {
+ background-position: -64px -320px;
+}
+.icons-window-line{
+ background-position: -96px -320px;
+}
+.icons-window-command{
+ background-position: -128px -320px;
+}
+.icons-window-list{
+ background-position: -160px -320px;
+}
+.icons-window-block{
+ background-position: -192px -320px;
+}
+.icons-terminal{
+ background-position: -224px -320px;
+}
+/*12*/
+.icons-check-2 {
+ background-position: -288px -352px;
+}
+.icons-star-thin {
+ background-position: -416px -352px;
+}
+.icons- {
+ background-position: -0px -352px;
+}
+/*13*/
+.icons- {
+ background-position: -0px -384px;
+}
+/*14*/
+.icons- {
+ background-position: -0px -416px;
+}
+/*15*/
+.icons- {
+ background-position: -0px -448px;
+}
+/*16*/
+.icons- {
+ background-position: -0px -480px;
+}
+/*17*/
+.icons- {
+ background-position: -0px -512px;
+}
+/*18*/
+.icons-help {
+ background-position: -160px -544px;
+}
+.icons- {
+ background-position: -0px -544px;
+}
+/*19*/
+.icons-plus-cube {
+ background-position: -192px -576px;
+}
+.icons-plus {
+ background-position: -288px -576px;
+}
+.icons-power {
+ background-position: -0px -608px;
+}
+/*20*/
+.icons- {
+ background-position: -0px -608px;
+}
+/*21*/
+.icons- {
+ background-position: -0px -640px;
}
\ No newline at end of file
diff --git a/app/assets/stylesheets/widget.css b/app/assets/stylesheets/widget.css
index b66a6074..7a658f36 100644
--- a/app/assets/stylesheets/widget.css
+++ b/app/assets/stylesheets/widget.css
@@ -59,32 +59,90 @@
}
.select-role {
display:none;
- overflow:hidden;
+ padding: 10px 0;
}
.file-upload {
position:relative;
+ overflow: hidden;
}
.file-upload .file-name {
- display: inline-block;
- margin: 0 0 5px 5px;
white-space: nowrap;
- width: 140px;
+ overflow: hidden;
+ border-style: solid;
+ border-width: 1px 1px 1px 0;
+ border-color: #CCC;
+ display: inline-block;
+ float: left;
+ padding: 4px 10px;
+ height: 18px;
+ line-height: 18px;
+ -webkit-border-radius: 0 3px 3px 0;
+ -moz-border-radius: 0 3px 3px 0;
+ border-radius: 0 3px 3px 0;
+ text-align: left;
+ margin: 0;
+ width: 182px;
}
.file-upload .upload {
margin:0;
padding:0;
position:absolute;
- top:0;
+ top: 0;
left:0;
opacity:.0;
- filter: alpha(opacity=100);
+ font-size: 60px;
+ left: -595px/9;
+ filter: alpha(opacity: 0);
+ outline: none;
}
.file-upload .upload:focus {
position:absolute;
}
.upload-picture {
- margin-right: 5px;
+ margin-bottom: 5px;
+ text-align: center;
+ width: 276px;
+ overflow: hidden;
+ height: 90px;
+}
+.upload-picture img {
+ left: 0;
+ margin-top: -15%;
+ width: 100%;
+}
+.widget-box .widgetInfo {
+ display: inline-block;
+ text-align: center;
+ width: 255px;
+ margin : 0px 0 5px;
+ padding: 5px 10px;
+}
+.file-upload .input-medium {
+ border-radius: 3px 3px 3px 3px !important;
+ width: 267px;
+ position: relative;
+ z-index: 5;
}
#widget-link table {
margin-bottom:0
+}
+/*Date*/
+.showDate {
+ border-style: solid;
+ border-width: 1px 0 1px 1px;
+ border-color: #CCC;
+ display: inline-block;
+ float: left;
+ padding: 4px 10px;
+ height: 18px;
+ line-height: 18px;
+ -webkit-border-radius: 3px 0 0 3px;
+ -moz-border-radius: 3px 0 0 3px;
+ border-radius: 3px 0 0 3px;
+ text-align: center;
+}
+.calendarInput {
+ position: absolute;
+ visibility: hidden;
+ left: 11px;
}
\ No newline at end of file
diff --git a/app/controllers/admin/ad_banners_controller.rb b/app/controllers/admin/ad_banners_controller.rb
index 19d81057..95ce7e7c 100644
--- a/app/controllers/admin/ad_banners_controller.rb
+++ b/app/controllers/admin/ad_banners_controller.rb
@@ -1,5 +1,5 @@
class Admin::AdBannersController < ApplicationController
- layout "admin"
+ layout "new_admin"
before_filter :authenticate_user!
before_filter :is_admin?
@@ -10,11 +10,14 @@ class Admin::AdBannersController < ApplicationController
end
def show
- @ad_banner = AdBanner.find(params[:id])
+ @ad_banners = AdBanner.all
+ @active = AdBanner.find(params[:id])
+ render :action => 'index'
end
def new
- @ad_banner = AdBanner.new
+ @ad_banners = AdBanner.all
+ render :action => 'index',:params => 'new'
end
def create
@@ -36,8 +39,13 @@ class Admin::AdBannersController < ApplicationController
redirect_to admin_ad_banners_url
end
+ def destroy_ad_image
+
+ end
+
def index
@ad_banners = AdBanner.all
+ @active = @ad_banners.first
end
end
\ No newline at end of file
diff --git a/app/controllers/admin/ad_images_controller.rb b/app/controllers/admin/ad_images_controller.rb
new file mode 100644
index 00000000..3fb681da
--- /dev/null
+++ b/app/controllers/admin/ad_images_controller.rb
@@ -0,0 +1,47 @@
+class Admin::AdImagesController < ApplicationController
+ layout 'new_admin'
+ before_filter :authenticate_user!
+ before_filter :is_admin?
+
+ def edit
+ @ad_banner = AdBanner.find params[:ad_banner_id]
+ @ad_image = @ad_banner.ad_images.find params[:id]
+ end
+
+ def update
+ @ad_banner = AdBanner.find params[:ad_banner_id]
+ @ad_image = AdImage.find params[:id]
+ @ad_image.update_attributes(params[:ad_image])
+ @ad_image.to_save = true
+ @ad_image.save!
+ redirect_to admin_ad_banner_path @ad_banner
+ end
+
+ def new
+ @ad_image =AdImage.new
+ #render :action => 'new',:url=> {:ad_banner_id => params.has_key?(:ad_banner_id)? params[:ad_banner_id],nil}
+ end
+
+ def create
+ @ad_banner = AdBanner.find params[:ad_banner][:id]
+ ad_image = AdImage.new params[:ad_image]
+ ad_image.to_save = true
+ @ad_banner.ad_images << ad_image
+
+ if @ad_banner.save!
+ redirect_to admin_ad_banner_path @ad_banner
+ end
+
+ end
+
+ def destroy
+ @ad_banner = AdBanner.find params[:ad_banner_id]
+ @ad_image = @ad_banner.ad_images.find params[:id]
+ if @ad_image.destroy
+ flash[:notice] = t('admin.success_destroy_ad_image')
+ redirect_to admin_ad_banner_path @ad_banner
+ end
+ end
+
+
+end
diff --git a/app/controllers/admin/object_auths_controller.rb b/app/controllers/admin/object_auths_controller.rb
index 58219acf..e8779dc4 100644
--- a/app/controllers/admin/object_auths_controller.rb
+++ b/app/controllers/admin/object_auths_controller.rb
@@ -1,8 +1,7 @@
class Admin::ObjectAuthsController < ApplicationController
include OrbitCoreLib::PermissionUnility
layout "admin"
- before_filter :authenticate_user!
- before_filter :check_if_user_can_do_object_auth
+ before_filter :force_order
# before_filter :is_admin? ,:only => :index
@@ -84,6 +83,12 @@ class Admin::ObjectAuthsController < ApplicationController
end
private
+
+ def force_order
+ authenticate_user!
+ check_if_user_can_do_object_auth
+ end
+
def check_if_user_can_do_object_auth
unless check_permission(:manager)
render :nothing => true, :status => 403
diff --git a/app/controllers/admin/sessions_controller.rb b/app/controllers/admin/sessions_controller.rb
new file mode 100644
index 00000000..00649580
--- /dev/null
+++ b/app/controllers/admin/sessions_controller.rb
@@ -0,0 +1,8 @@
+class SessionsController < Devise::SessionsController
+
+ def create
+ super
+ reset_session
+ end
+
+end
\ No newline at end of file
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 4b433777..fb82774e 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -47,7 +47,7 @@ class ApplicationController < ActionController::Base
# Render the page
def render_page(id = nil)
if @item
- render :text => parse_page(@item, id)
+ render :text => process_page(@item, id), :layout => 'page_layout'
else
render :text => '404 Not Found'
end
diff --git a/app/controllers/gridfs_controller.rb b/app/controllers/gridfs_controller.rb
index 8a95a581..4be7ec17 100644
--- a/app/controllers/gridfs_controller.rb
+++ b/app/controllers/gridfs_controller.rb
@@ -3,7 +3,7 @@ require 'mongo'
class GridfsController < ActionController::Metal
def serve
- gridfs_path = env["PATH_INFO"].gsub("/gridfs/", "")
+ gridfs_path = env["PATH_INFO"].gsub("/gridfs/", "").force_encoding("UTF-8")
begin
gridfs_file = Mongo::GridFileSystem.new(Mongoid.database).open(gridfs_path, 'r')
self.response_body = gridfs_file.read
diff --git a/app/controllers/orbit_backend_controller.rb b/app/controllers/orbit_backend_controller.rb
index d3639ebe..fe37db82 100644
--- a/app/controllers/orbit_backend_controller.rb
+++ b/app/controllers/orbit_backend_controller.rb
@@ -1,11 +1,12 @@
class OrbitBackendController< ApplicationController
- before_filter :authenticate_user!
+ before_filter :force_order,:except => [:public]
before_filter :setup_vars
# before_filter {|c| c.front_end_available(@app_title)}
- before_filter :check_user_can_use,:except => [:public]
+ # before_filter :check_user_can_use
include OrbitCoreLib::PermissionUnility
+ include AdminHelper
- layout 'admin'
+ layout 'new_admin'
def setup_vars
@app_title = request.fullpath.split('/')[2]
@@ -14,6 +15,11 @@ class OrbitBackendController< ApplicationController
private
+ def force_order
+ authenticate_user!
+ check_user_can_use
+ end
+
def check_user_can_use
unless check_permission
redirect_to polymorphic_path(['panel',@app_title,'back_end','public'])
diff --git a/app/controllers/orbit_frontend_component_controller.rb b/app/controllers/orbit_frontend_component_controller.rb
index 12695040..185dbce6 100644
--- a/app/controllers/orbit_frontend_component_controller.rb
+++ b/app/controllers/orbit_frontend_component_controller.rb
@@ -1,7 +1,7 @@
class OrbitFrontendComponentController< ApplicationController
before_filter :setup_vars
before_filter {|c| c.front_end_available(@app_title)}
- layout 'module_widget'
+ layout :false
def setup_vars
@app_title = request.fullpath.split('/')[2]
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index aa66238d..4860ea2e 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -1,5 +1,7 @@
class PagesController < ApplicationController
+ include ApplicationHelper
+
before_filter :get_item, :only => [:index_from_link, :show_from_link]
def index
@@ -30,7 +32,11 @@ class PagesController < ApplicationController
end
def index_from_link
- redirect_to "/#{@item.full_name}"
+ if params[:page]
+ redirect_to "/#{@item.full_name}?page=#{params[:page]}"
+ else
+ redirect_to "/#{@item.full_name}"
+ end
end
def show_from_link
diff --git a/app/helpers/admin/ad_banner_helper.rb b/app/helpers/admin/ad_banner_helper.rb
index 0621df38..eff12427 100644
--- a/app/helpers/admin/ad_banner_helper.rb
+++ b/app/helpers/admin/ad_banner_helper.rb
@@ -1,2 +1,16 @@
module Admin::AdBannerHelper
+ def preview_block_ad_images_helper(ad_banner)
+ printable_ad_images = []
+ ad_banner.ad_images.each do |ad_image|
+ if ad_image.display?
+ ad_image.weight.times do
+ printable_ad_images << ad_image
+ end
+ end
+ end
+
+ printable_ad_images.shuffle!
+ end
+
+
end
\ No newline at end of file
diff --git a/app/helpers/admin/ad_images_helper.rb b/app/helpers/admin/ad_images_helper.rb
new file mode 100644
index 00000000..1f2422fc
--- /dev/null
+++ b/app/helpers/admin/ad_images_helper.rb
@@ -0,0 +1,7 @@
+module Admin::AdImagesHelper
+
+ def active_when_default_locale_eq locale
+ locale.to_sym == I18n.default_locale ? 'active': ''
+ end
+
+end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 50510e3c..e45fa4d6 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2,6 +2,12 @@ module ApplicationHelper
FLASH_NOTICE_KEYS = [:error, :notice, :warning]
+ def site_valid_locales_default_head
+ index = @site_valid_locales.rindex I18n.default_locale.to_s
+ shift_out = @site_valid_locales.shift(index)
+ @site_valid_locales += shift_out
+ end
+
def colorize_in_use_locale(locale)
@site_in_use_locales.include?(locale)? 'green' : 'red'
end
@@ -77,7 +83,7 @@ module ApplicationHelper
end
def active_for_action(controller_name, action_name)
- (controller.controller_name.eql?(controller_name) && controller.action_name.eql?(action_name)) ? 'active' : nil
+ ((controller.controller_name.eql?(controller_name) || request.fullpath.eql?(controller_name)) && controller.action_name.eql?(action_name)) ? 'active' : nil
end
def sortable(column)
@@ -96,15 +102,55 @@ module ApplicationHelper
' web-symbol' if params[:sort].eql?(name)
end
- def add_filter(param_name, value)
- filter = params[:filter] rescue nil
- if filter && filter.has_key(param_name)
- filter[param_name] << value
- elsif filter
- filter.merge({param_name => [value]})
- else
- {param_name => [value]}
+ def is_filter_active?(type, id)
+ ' active' if (@filter[type].include?(id.to_s) rescue nil)
+ end
+
+ def process_page(page, id)
+ parse_page_noko(page, id)
+ end
+
+ def page_metas(page)
+ metas = ''
+ @site.page_metas.each do |meta|
+ name, content = meta.get_name_content
+ metas << "#{page.title ? page.title[I18n.locale] : page.i18n_variable[I18n.locale]} \n"
+ end
+
+ def page_stylesheets(page)
+ stylesheets = ''
+ stylesheets << "" id=<%= ad_banner_tab.title %>>
+
尺寸：
+
+ <%= form_for ad_banner_tab,:url=> admin_ad_banner_path(ad_banner_tab),:method => :put,:class=>"input-medium" do |f| -%>
+ <%= f.label :ad_fx, t('admin.ad.ab_fx') %>
+ <%= f.select :ad_fx ,AdBanner::FX_TYPES %>
+ <%= f.label :transition_sec, t('admin.ad.transition_sec') %>
+ <%= f.text_field :transition_sec,:placeholder=>"3秒請輸入3000",:class=> "span3" %> <%= t("admin.ad.trans_unit_sec") %>
+ <%= f.submit %>
+ <%= f.submit 'Cancel',:type=>'reset' %>
+
+ <%= render :partial => "ad_image_update", :collection => ad_banner_tab.ad_images,:as => :ad_image,:locals=>{:ad_banner => ad_banner_tab} %>
+ <%#= render :partial => 'new_add_banner_file', :object => ad_banner_tab.ad_images.build, :locals => { :field_name => "new_ad_images[]", :f => f, :classes => "r_destroy" } %>
+ <%= link_to 'Add AdImage',new_admin_ad_banner_ad_image_path(ad_banner_tab) %>
+
+ <% end -%>
+ <%= render :partial => 'preview_block',:locals=> {:ad_banner =>ad_banner_tab} %>
+
- <%= image_tag ad_image.file %>
-
- Time to next: <%= ad_image.time_to_next %>
- Intro: <%= ad_image.picture_intro %>
- Out Link <%= link_to ad_image.out_link %> by <%= ad_image.link_open %>
-
-
- <%= image_tag ad_image.file %>
-
- Time to next: <%= ad_image.time_to_next %>
- Intro: <%= ad_image.picture_intro %>
- Out Link <%= link_to ad_image.out_link %> by <%= ad_image.link_open %>
-
-
- Destroy?<%= f.check_box :to_destroy %>
- <%= render :partial => "ad_image_form", :locals => { :f => f } %>
-
-<% end %>
-
+
+ <%= image_tag ad_image.file rescue nil%>
+
+ <%= ad_image.display? ? '[Showing]' : '[NotShawing]' %>
+ <%= "#{ad_image.post_date ||'NeedReset' }~#{ad_image.unpost_date || 'NeedReset'}" %>
+
+
+ <%= link_to 'Edit',edit_admin_ad_banner_ad_image_path(ad_banner,ad_image),:class => 'btn btn-primary' %>
+ <%= link_to 'Del',admin_ad_banner_ad_image_path(ad_banner,ad_image),:class => 'btn',:method => :delete,:confirm => t('sure?') %>
+
+
diff --git a/app/views/admin/ad_banners/_form.html.erb b/app/views/admin/ad_banners/_form.html.erb
deleted file mode 100644
index c29d9aef..00000000
--- a/app/views/admin/ad_banners/_form.html.erb
+++ /dev/null
@@ -1,53 +0,0 @@
-<% content_for :page_specific_css do %>
- <%#= javascript_include_tag "ad_banner" #this line wont work %>
-
-<% end %>
-
-
-
- <%= f.label :title, t('admin.title') %>
- <%= f.text_field :title, :class => 'text' %>
-
-
- <%= f.label :picture_position, t('admin.picture_position') %>
- <%= f.text_field :picture_position, :class => 'text' %>
-
-
-
- <%= f.label :post_date, t('admin.post_date') %>
- <%= f.date_select :post_date, :order => [:year, :month, :day], :use_month_numbers => true %>
-
-
-
- <%= f.label :unpost_date, t('admin.unpost_date') %>
- <%= f.date_select :unpost_date, :order => [:year, :month, :day], :use_month_numbers => true,:prompt => { :day => t('form.date_unlimited'), :month => t('form.date_unlimited'), :year => t('form.date_unlimited') } %>
-
-
- <%= f.label :context, t('admin.context') %>
- <%= f.text_field :context, :class => 'text' %>
-
-
-
- <%= f.label :direct_to_after_click, t('admin.direct_to_after_click') %>
- <%= f.check_box :direct_to_after_click %>
-
-
- <%= f.label :ad_fx, t('admin.ad_fx') %>
- <%= f.select :ad_fx ,AdBanner::FX_TYPES %>
-
-
- <%#= f.label :ad_images, t('admin.ad_images') %>
-
- <%# @ad_banner.ad_images.each do |ad_image| %>
- <%#= render :partial => 'ad_image_update', :object => ad_image, :locals => { :field_name => "ad_images", :f => f, :classes => "r_destroy, r_edit" } %>
- <%# end %>
- <%= render :partial => "ad_image_update", :collection => @ad_banner.ad_images,:as => :ad_image, %>
-
- <%= render :partial => 'new_add_banner_file', :object => @ad_banner.ad_images.build, :locals => { :field_name => "new_ad_images[]", :f => f, :classes => "r_destroy" } %>
-
-
-
-
-
- <%#= render :partial => 'new_design_file', :object => @design.themes.build, :locals => { :field_name => "themes", :f => f, :classes => "r_destroy" } %>
-
diff --git a/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb b/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb
new file mode 100644
index 00000000..8e8de1d9
--- /dev/null
+++ b/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb
@@ -0,0 +1,55 @@
+
+
+ <%= form_for(:ad_banner,:remote => true, :url => admin_ad_banners_path) do |f| %>
+
+
+
+
+
+ <%= f.label :title,t('admin.ad.title'),:class => "control-label" %>
+
+ <%= f.text_field :title %>
+
+
+
+
+ <%= f.label :transition_sec, t('admin.ad.transition_sec'),:class => "control-label" %>
+
+ <%= f.text_field :transition_sec %> <%= t("admin.ad.trans_unit_sec") %>
+
+
+
+
+ <%= f.label :ad_fx, t('admin.ad.ab_fx') %>
+
+ <%= f.select :ad_fx ,AdBanner::FX_TYPES %>
+
+
+
+
+ <% end %>
+
+
+
diff --git a/app/views/admin/ad_banners/_new_add_banner_file.html.erb b/app/views/admin/ad_banners/_new_add_banner_file.html.erb
index 64733ca4..457b57f1 100644
--- a/app/views/admin/ad_banners/_new_add_banner_file.html.erb
+++ b/app/views/admin/ad_banners/_new_add_banner_file.html.erb
@@ -1,7 +1,7 @@
<%= f.fields_for field_name, new_add_banner_file do |f| %>
<%= f.file_field :file %>
- <%= render :partial => "ad_image_form", :locals => { :f => f } %>
+ <%#= render :partial => "ad_image_form", :locals => { :f => f } %>
<%= button_tag '+', :class => "multi_files"%>
<% end %>
\ No newline at end of file
diff --git a/app/views/admin/ad_banners/_preview_block.html.erb b/app/views/admin/ad_banners/_preview_block.html.erb
new file mode 100644
index 00000000..c2185d04
--- /dev/null
+++ b/app/views/admin/ad_banners/_preview_block.html.erb
@@ -0,0 +1,29 @@
+<% if ad_banner -%>
+<%= link_to 'Preview',"#slideshow-#{ad_banner.title.dehumanize}",:class=>"btn btn-primary btn-large",:data=>{:toggle=>'modal'} %>
+
+
+
+
+
+ <% preview_block_ad_images_helper(ad_banner).each do |ad_image| -%>
+ <%= image_tag ad_image.file,:alt => (ad_image.title[locale] || ' '),:time_to_next => ad_banner.transition_sec,:link_open=> ad_image.link_open, :link_url =>((ad_image.out_link || ad_banner.context || ' ')) %>
+ <% end -%>
+
+
+
+
+
+<% end -%>
+
+
+
diff --git a/app/views/admin/ad_banners/_side_bar.html.erb b/app/views/admin/ad_banners/_side_bar.html.erb
deleted file mode 100644
index ce0e1296..00000000
--- a/app/views/admin/ad_banners/_side_bar.html.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
<%= t('admin.setup_member') %>
-
- <%= link_to content_tag(:span, t('admin.list_users')), admin_users_path %>
- <%= link_to content_tag(:span, t('admin.list_roles')), admin_roles_path %>
- <%= link_to content_tag(:span, t('admin.list_infos')), admin_infos_path %>
-
-
\ No newline at end of file
diff --git a/app/views/admin/ad_banners/edit.html.erb b/app/views/admin/ad_banners/edit.html.erb
deleted file mode 100644
index 7ccb00d0..00000000
--- a/app/views/admin/ad_banners/edit.html.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-
<%= t('admin.editing_ad_banner') %>
-
-<%= form_for @ad_banner, :url => admin_ad_banner_path(@ad_banner),:html => {:multipart => true} do |f| %>
- <%= f.error_messages %>
- <%= render :partial => "form", :locals => { :f => f } %>
-
- <%= f.submit t('update') %> <%= link_back %>
-
-<% end %>
-
-
diff --git a/app/views/admin/ad_banners/index.html.erb b/app/views/admin/ad_banners/index.html.erb
index e109830e..e6ebfd5d 100644
--- a/app/views/admin/ad_banners/index.html.erb
+++ b/app/views/admin/ad_banners/index.html.erb
@@ -1,48 +1,17 @@
-<% content_for :secondary do %>
-
-
<%= t('admin.setup_ad_banners') %>
-
- <%= link_to content_tag(:span, t('admin.new_ad_banner')), new_admin_ad_banner_path, :class => 'seclink1' %>
+<%= stylesheet_link_tag "admin/ad_banner_preview" %>
+
+
+
+ <% @ad_banners.each do |ab| %>
+ <%= content_tag :li,link_to(ab.title,"##{ab.title}",:data=>{:toggle=>"tab"}),:class => (ab == @active ? 'active' : nil ) %>
+ <% end -%>
+ <%= content_tag :li,link_to('New',"#new-a-banner",:data=>{:toggle=>"tab"}),:id=>'new_ad_banner_tab_but',:class => (@active.nil? ? 'active' : nil ) %>
+
+
+
+ <%= render :partial => 'ad_banner_tab',:collection => @ad_banners %>
+ <%= render :partial => "modal_ad_banner_form"%>
+
+
-
<%= t('admin.list_ad_banners') %>
-
-
-
-
- <%= t('admin.title') %>
- <%= t('admin.picture_position') %>
- <%= t('admin.post_date') %>
- <%= t('admin.unpost_date') %>
- <%= t('admin.context') %>
- <%= t('admin.direct_to_after_click') %>
- <%= t('admin.now_display?') %>
-
-
-<% @ad_banners.each do |ad_banner| %>
-
- <%= ad_banner.title %>
- <%= ad_banner.picture_position %>
- <%= ad_banner.post_date %>
- <%= ad_banner.unpost_date.nil?? t('form.date_unlimited'): ad_banner.unpost_date %>
- <%= ad_banner.context %>
- <%= ad_banner.direct_to_after_click %>
- <%= ad_banner.display? %>
-
- <%= link_to t(:show), admin_ad_banner_path(ad_banner), :class => 'show' %>
- <%= link_to t(:edit), edit_admin_ad_banner_path(ad_banner), :class => 'edit' %>
- <%= link_to t(:delete), admin_ad_banner_path(ad_banner), :confirm => t('sure?'), :method => :delete, :class => 'delete' %>
-
-
-
-
- <%= link_to t('admin.new_ad_banner'), new_admin_ad_banner_path, :class => 'new' %>
-
\ No newline at end of file
diff --git a/app/views/admin/ad_banners/new.html.erb b/app/views/admin/ad_banners/new.html.erb
index 31d182b7..e69de29b 100644
--- a/app/views/admin/ad_banners/new.html.erb
+++ b/app/views/admin/ad_banners/new.html.erb
@@ -1,13 +0,0 @@
-
-
<%= t('admin.new_ad_banner') %>
-
- <%= form_for :ad_banner, :url => admin_ad_banners_path, :html => {:multipart => true} do |f| %>
- <%= f.error_messages %>
- <%= render :partial => "form", :locals => { :f => f } %>
-
-
- <%= link_back %>
- <%= f.submit t('create') %>
-
- <% end %>
-
- <%=t('admin.ad_banner.title') %> <%= @ad_banner.title %>
- <%=t('admin.ad_banner.picture_position') %> <%= @ad_banner.picture_position %>
- <%=t('admin.ad_banner.post_date') %> <%= @ad_banner.post_date %>
- <%=t('admin.ad_banner.unpost_date') %> <%= @ad_banner.unpost_date %>
- <%=t('admin.ad_banner.context') %> <%= @ad_banner.context %>
- <%=t('admin.ad_banner.direct_to_after_click') %> <%= @ad_banner.direct_to_after_click %>
- <%=t('admin.ad_banner.ad_fx') %> <%= @ad_banner.ad_fx %>
-
-
- <%= render :partial => "admin/ad_banners/ad_image_show", :collection => @ad_banner.ad_images,:as => :ad_image %>
-
diff --git a/app/views/admin/ad_images/_form.html.erb b/app/views/admin/ad_images/_form.html.erb
new file mode 100644
index 00000000..1089db3b
--- /dev/null
+++ b/app/views/admin/ad_images/_form.html.erb
@@ -0,0 +1,188 @@
+<% content_for :page_specific_css do %>
+ <%= stylesheet_link_tag "lib/datepicker" %>
+<% end %>
+<% content_for :page_specific_javascript do %>
+ <%= javascript_include_tag "lib/datepicker" %>
+ <%= javascript_include_tag "lib/date.format" %>
+<% end %>
+
+
+
+
+
+ Preview/預覽
+ Submit/送出
+ Cancel/取消
+
+
+
\ No newline at end of file
diff --git a/app/views/admin/ad_images/edit.html.erb b/app/views/admin/ad_images/edit.html.erb
new file mode 100644
index 00000000..5fbf198c
--- /dev/null
+++ b/app/views/admin/ad_images/edit.html.erb
@@ -0,0 +1,8 @@
+<%= flash_messages %>
+
+<%= form_for @ad_image, :url => admin_ad_banner_ad_image_path, :html => { :class => 'form' } do |f| %>
+
+ <%= render :partial => "form", :locals => { :f => f } %>
+
+
+<% end %>
diff --git a/app/views/admin/ad_images/new.html.erb b/app/views/admin/ad_images/new.html.erb
new file mode 100644
index 00000000..99379faa
--- /dev/null
+++ b/app/views/admin/ad_images/new.html.erb
@@ -0,0 +1,8 @@
+<%= flash_messages %>
+
+<%= form_for @ad_image, :url => create_ad_image_admin_ad_banners_path, :html => { :class => 'form' ,:multipart => true} do |f| %>
+
+ <%= render :partial => "form", :locals => { :f => f } %>
+
+
+<% end %>
diff --git a/app/views/admin/pages/_app_selector.html.erb b/app/views/admin/pages/_app_selector.html.erb
new file mode 100644
index 00000000..c20a3885
--- /dev/null
+++ b/app/views/admin/pages/_app_selector.html.erb
@@ -0,0 +1 @@
+<%= f.select :module_app_id, @apps.collect { |t| [t.title.capitalize, t.id] }, {:include_blank => true} ,{:rel => admin_module_apps_path } %>
diff --git a/app/views/admin/pages/_form.html.erb b/app/views/admin/pages/_form.html.erb
index 9722413c..6c211d01 100644
--- a/app/views/admin/pages/_form.html.erb
+++ b/app/views/admin/pages/_form.html.erb
@@ -25,7 +25,7 @@
<%= t('admin.module_app') %>
- <%= render :partial => "admin/module_apps/app_selector", :locals => { :f => f } %>
+ <%= render :partial => "app_selector", :locals => { :f => f } %>
<%= select('page','app_frontend_url', @app_frontend_urls, :selected => @item.app_frontend_url ) rescue ''%>
<%= select('page','category', @categories.collect{|category| [category.i18n_variable[I18n.locale], category.id]}, :selected => @item[:category] ) rescue ''%>
diff --git a/app/views/admin/pages/_show.html.erb b/app/views/admin/pages/_show.html.erb
index 1937fe92..ba9bcf48 100644
--- a/app/views/admin/pages/_show.html.erb
+++ b/app/views/admin/pages/_show.html.erb
@@ -1,3 +1,7 @@
<%= flash_messages %>
-<%= parse_page_edit(@item).html_safe %>
\ No newline at end of file
+
+<%= page_stylesheets(@item).html_safe %>
+<%= page_javascripts(@item).html_safe %>
+
+<%= parse_page_edit_noko(@item).html_safe %>
\ No newline at end of file
diff --git a/app/views/admin/tags/_tag.html.erb b/app/views/admin/tags/_tag.html.erb
index a103efc4..1f9ff38a 100644
--- a/app/views/admin/tags/_tag.html.erb
+++ b/app/views/admin/tags/_tag.html.erb
@@ -1,8 +1,13 @@
-
+
+
+
+
<%= link_to t(:edit), edit_admin_tag_path(tag), :remote => true %>
<%= link_to t(:delete), admin_tag_path(tag), :confirm => t('sure?'), :method => :delete, :remote => true %>
+
\ No newline at end of file
diff --git a/app/views/admin/tags/index.html.erb b/app/views/admin/tags/index.html.erb
index 5e757313..cca4b6af 100644
--- a/app/views/admin/tags/index.html.erb
+++ b/app/views/admin/tags/index.html.erb
@@ -1,6 +1,16 @@
-
<%= link_to t(:homepage), root_path, :class => 'orbit-bar-home' %>
+ Desktop
@@ -25,10 +26,17 @@
<% end %>
+
+
+ search
+
+
<% if user_signed_in? %>
- <%= current_user.name %>
@@ -94,9 +102,6 @@
<% end %>
-
<%= @title || APP_CONFIG['orbit'] %>
<%= @title || APP_CONFIG['orbit'] %>
<%= stylesheet_link_tag "devise" %>
<%= javascript_include_tag "devise" %>
diff --git a/app/views/layouts/module_widget.html.erb b/app/views/layouts/module_widget.html.erb
index 254ac4e9..44a2be85 100644
--- a/app/views/layouts/module_widget.html.erb
+++ b/app/views/layouts/module_widget.html.erb
@@ -2,7 +2,7 @@
<%#= stylesheet_link_tag "module_widget" %>
<%= javascript_include_tag "module_widget" %>
diff --git a/app/views/layouts/new_admin.html.erb b/app/views/layouts/new_admin.html.erb
index 3ae7a2a2..b6156c5d 100644
--- a/app/views/layouts/new_admin.html.erb
+++ b/app/views/layouts/new_admin.html.erb
@@ -4,7 +4,7 @@
<%= @title || APP_CONFIG['orbit'] %>
<%= stylesheet_link_tag "new_admin" %>
<%= javascript_include_tag "new_admin" %>
diff --git a/app/views/layouts/page_layout.html.erb b/app/views/layouts/page_layout.html.erb
new file mode 100644
index 00000000..8fb884b0
--- /dev/null
+++ b/app/views/layouts/page_layout.html.erb
@@ -0,0 +1,17 @@
+
+
+
+<%= @title || APP_CONFIG['orbit'] %>
RulingSite
+ #{lang} "
+ # end
+ # }.join(' | ')
+ # end
+ # c.define_tag 'link' do |tag|
+ # item = Item.first(:conditions => { :full_name => tag.attr['name'] })
+ # ret = ''
+ # ret << ""
+ # ret << item.i18n_variable[I18n.locale]
+ # ret << " "
+ # end
+
+ def parse_page_edit_noko(page, id = nil)
+ body = Nokogiri::HTML(page.design.layout.body)
+ parse_menu(body, page, true)
+ public_r_tags = parse_content_edits(body, page, id)
+ parse_images(body, page)
+
+ public_r_tags.each do |tag|
+ send("parse_#{tag}s", body, page,id)
end
+
+ body.to_html
end
-
- def parser_context_edit(page, attributes = {})
- Radius::Context.new do |c|
- c.define_tag 'snippet' do |tag|
- snippet = Snippet.first(:conditions => {:name => tag.attr['name']})
- if snippet
- snippet.content
- else
- t('nothing')
- end
- end
- c.define_tag 'language_bar' do
- @site.in_use_locales.map{ |locale|
- lang = I18nVariable.first(:conditions => {:key => locale})[locale]
- if I18n.locale.to_s.eql?(locale)
- lang
- else
- "#{lang} "
- end
- }.join(' | ')
- end
- c.define_tag 'css' do |tag|
- assets = Asset.any_in(:filename => tag.attr['name'].split(',').map(&:strip))
- res = ''
- assets.each do |asset|
- res << ""
- ad_banner.ad_images.each do |ad_image|
- res << "
"
- end
- res << "
"
- ret << tag.expand
+
+ # page_contents
+ def parse_content_edits(body, page, id)
+ public_r_tags = []
+ body.css('.page_content').each do |content|
+ ret = ''
+ if (content["main"] == "true" && !page.module_app.nil?)
+ ret << "
"
+ else
+ part = page.page_parts.detect{ |p| p.name.to_s == content['name'].to_s } rescue nil
+ ret << "
" if part
+ ret << "
'
- end
- c.define_tag 'content' do |tag|
- ret = ''
- if (tag.attributes["main"] == "true" && !page.module_app.nil?)
- ret << "
"
- else
- part = page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s }
- ret << "
"
- ret << "
'
- case part.kind
- when 'text'
- ret << part.i18n_variable[I18n.locale] rescue ''
- when 'module_widget'
- if part[:category]
- ret << "
"
- else
- ret << "
"
- end
- when 'public_r_tag'
- ret << "
"
- else
- ''
+ case part.kind
+ when 'text'
+ ret << part.i18n_variable[I18n.locale] rescue ''
+ when 'module_widget'
+ if part[:category]
+ ret << "
"
+ else
+ ret << "
"
end
- ret << '
'
- end
+ when 'public_r_tag'
+ ret << "
"
+ public_r_tags << part.public_r_tag
+ else
+ ''
+ end if part
end
- c.define_tag 'link' do |tag|
- item = Item.first(:conditions => { :full_name => tag.attr['name'] })
- ret = ''
- ret << "
"
- ret << item.i18n_variable[I18n.locale]
- ret << " "
- end
- c.define_tag 'menu' do |tag|
- home = get_homepage
- menu = page.design.layout.menu
- menu_level(home, 0, menu, true)
+ scope = "<#{content.name}"
+ content.attributes.each_pair do |key, value|
+ scope << " #{key}='#{value}'"
end
+ scope << ">#{ret}"
+ fragment = Nokogiri::HTML::DocumentFragment.new(body, scope)
+ content.swap(fragment)
end
+ public_r_tags.uniq
end
-
+
+
def self.included(base)
- base.send :helper_method, :parse_page_edit if base.respond_to? :helper_method
+ base.send :helper_method, :parse_page_edit_noko if base.respond_to? :helper_method
end
end
diff --git a/lib/parsers/parser_common.rb b/lib/parsers/parser_common.rb
index 8d43c070..93ea2608 100644
--- a/lib/parsers/parser_common.rb
+++ b/lib/parsers/parser_common.rb
@@ -2,7 +2,7 @@ module ParserCommon
def menu_level(page, current, menu, edit = false)
res = ''
- if current <= menu.levels
+ if menu.levels > 0 && current <= menu.levels
if current != 0
res << "
"
item = rand(100000)
@@ -44,4 +44,66 @@ module ParserCommon
res << ""
end
+ # ad_banners
+ def parse_ad_banners(body = nil, page = nil, id = nil)
+ body.css('ad_banner').each do |banner|
+ res = ''
+ ad_banner = AdBanner.find(banner["id"]) rescue nil
+ if ad_banner
+ res << ""
+ res << "
"
+ printable_ad_images = []
+ ad_banner.ad_images.each do |ad_image|
+ if ad_image.display?
+ ad_image.weight.times do
+ printable_ad_images << ad_image
+ end
+ end
+ end
+ printable_ad_images.shuffle!
+ printable_ad_images.each do |ad_image| #TODO Need Reflact
+ res << "
"
+ end
+ res << "
"
+ end
+ fragment = Nokogiri::HTML::DocumentFragment.new(body, res)
+ banner.swap(fragment)
+ end
+ end
+
+ # page_images
+ def parse_images(body, page)
+ body.css('.page_image').each do |page_image|
+ # image = page.custom_images.detect{|image| image.name.eql?(tag.attr['name']) }
+ # image = page.design.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } unless image
+ image = page.design.images.detect{|image| image.name.eql?(File.basename(page_image['src'])) } unless image
+ if image
+ res = "
'
+ end
+ fragment = Nokogiri::HTML::DocumentFragment.new(body, res)
+ page_image.swap(fragment)
+ end
+ end
+
+ # page_menu
+ def parse_menu(body, page, edit=nil)
+ page_menu = body.css('.page_menu').first
+ home = get_homepage
+ menu = page.design.layout.menu
+ fragment = Nokogiri::HTML::DocumentFragment.new(body, menu_level(home, 0, menu, edit))
+ page_menu.swap(fragment)
+ end
+
end
diff --git a/lib/parsers/parser_front_end.rb b/lib/parsers/parser_front_end.rb
index 305596ed..dfec0dd9 100644
--- a/lib/parsers/parser_front_end.rb
+++ b/lib/parsers/parser_front_end.rb
@@ -1,179 +1,77 @@
module ParserFrontEnd
- require 'radius'
include ParserCommon
+ # c.define_tag 'language_bar' do
+ # @site.in_use_locales.map{ |locale|
+ # lang = I18nVariable.first(:conditions => {:key => locale})[locale]
+ # if I18n.locale.to_s.eql?(locale)
+ # lang
+ # else
+ # "
#{lang} "
+ # end
+ # }.join(' | ')
+ # end
+ # c.define_tag 'link' do |tag|
+ # item = Item.first(:conditions => { :full_name => tag.attr['name'] })
+ # ret = ''
+ # ret << "
"
+ # ret << item.i18n_variable[I18n.locale]
+ # ret << ' '
+ # end
+ # end
- def parser_context(page, attributes = {}, id = nil)
- Radius::Context.new do |c|
- c.define_tag 'snippet' do |tag|
- snippet = Snippet.first(:conditions => {:name => tag.attr['name']})
- if snippet
- snippet.content
- else
- t('nothing')
- end
- end
- c.define_tag 'language_bar' do
- @site.in_use_locales.map{ |locale|
- lang = I18nVariable.first(:conditions => {:key => locale})[locale]
- if I18n.locale.to_s.eql?(locale)
- lang
- else
- "
#{lang} "
- end
- }.join(' | ')
- end
- c.define_tag 'locale' do |tag|
- case attributes[:locale]
- when 'create'
- var = I18nVariable.new(:key => (tag.attr['name'] rescue nil), :document_class => 'Text')
- @site.valid_locales.each do |locale|
- var[locale] = tag.attr[locale] rescue nil
- end
- var.save!
- res = ''
- res << "
'
- when 'show'
- var = I18nVariable.find(tag.attr['id'])
- res = ''
- res << "
'
- when 'destroy'
- var = I18nVariable.find(tag.attr['id'])
- var.destroy
- end
- end
- c.define_tag 'css' do |tag|
- assets = Asset.any_in(:filename => tag.attr['name'].split(',').map(&:strip))
- res = ''
- assets.each do |asset|
- res << "
" if asset.data.file.content_type.eql?('text/css')
- end
- res
- end
- c.define_tag 'stylesheets' do |tag|
- res = ''
- res << "
"
- res << "
"
- res << "
" if page.design.reset_css
- res << "
" if page.design.default_css
- theme = page.design.themes.detect{ |d| d.id == page.theme_id }
- res << "
" if theme
- res
- end
- c.define_tag 'javascripts' do |tag|
- res = ''
- res << ""
- res << ""
- res << ""
- res << ""
- res << ""
- res << ""
- res << ""
- res << ""
- res << ""
- page.design.javascripts.each do |js|
- # res << ""
- end
- res
- end
- c.define_tag 'ad_banner' do |tag|
- res = ''
- ad_banner = AdBanner.find(tag.attr["id"]) rescue nil
- if ad_banner && ad_banner.display?
- res << ""
- res << "
"
- ad_banner.ad_images.each do |ad_image|
- res << "
"
- end
- res << "
"
- end
- res
- end
- c.define_tag 'image' do |tag|
- # image = page.custom_images.detect{|image| image.name.eql?(tag.attr['name']) }
- # image = page.design.custom_images.detect{|image| image.name.eql?(tag.attr['name']) } unless image
- image = page.design.images.detect{|image| image.name.eql?(tag.attr['name']) } unless image
- if image
- res = "
'
- end
- end
- c.define_tag 'layout_part' do |tag|
- part = page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s } rescue nil
- part.content
- end
- c.define_tag 'content' do |tag|
- ret = ''
- if (tag.attributes["main"] == "true" && !page.module_app.nil?)
- ret << "
"
- else
- part = page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s } rescue nil
- case part.kind
- when 'text'
- ret << part.i18n_variable[I18n.locale] rescue ''
- when 'module_widget'
- if part[:category]
- ret << "
"
- else
- ret << "
"
- end
- when 'public_r_tag'
- ret << "
"
- else
- ''
- end
- end
- ret
- end
- c.define_tag 'link' do |tag|
- item = Item.first(:conditions => { :full_name => tag.attr['name'] })
- ret = ''
- ret << "
"
- ret << item.i18n_variable[I18n.locale]
- ret << ' '
- end
- c.define_tag 'menu' do |tag|
- home = get_homepage
- menu = page.design.layout.menu
- menu_level(home, 0, menu)
- end
+ require 'nokogiri'
+
+ def parse_page_noko(page, id = nil)
+ body = Nokogiri::HTML(page.design.layout.body)
+ parse_menu(body, page)
+ public_r_tags = parse_contents(body, page, id)
+ parse_images(body, page)
+
+ public_r_tags.each do |tag|
+ send("parse_#{tag}s", body, page,id)
end
+
+ body.to_html
end
-
- def parse_page(page, id = nil)
- if page._type == 'Page'
- layout_content = page.design.layout.content.force_encoding('UTF-8') rescue ''
- context = parser_context(page, {}, id)
- parser = Radius::Parser.new(context, :tag_prefix => 'r')
- parser.parse(parser.parse(layout_content))
+
+ # page_contents
+ def parse_contents(body, page, id)
+ public_r_tags = []
+ body.css('.page_content').each do |content|
+ ret = ''
+ if (content["main"] == "true" && !page.module_app.nil?)
+ ret << "
"
+ else
+ part = page.page_parts.detect{ |p| p.name.to_s == content['name'].to_s } rescue nil
+ case part.kind
+ when 'text'
+ ret << part.i18n_variable[I18n.locale] rescue ''
+ when 'module_widget'
+ if part[:category]
+ ret << "
"
+ else
+ ret << "
"
+ end
+ when 'public_r_tag'
+ ret << "
"
+ public_r_tags << part.public_r_tag
+ else
+ ''
+ end if part
+ end
+ scope = "<#{content.name}"
+ content.attributes.each_pair do |key, value|
+ scope << " #{key}='#{value}'"
+ end
+ scope << ">#{ret}"
+ fragment = Nokogiri::HTML::DocumentFragment.new(body, scope)
+ content.swap(fragment)
end
- end
-
- def self.included(base)
- base.send :helper_method, :parse_page if base.respond_to? :helper_method
+ public_r_tags.uniq
end
end
diff --git a/lib/parsers/parser_layout.rb b/lib/parsers/parser_layout.rb
index 4a0232c6..3379c487 100644
--- a/lib/parsers/parser_layout.rb
+++ b/lib/parsers/parser_layout.rb
@@ -1,44 +1,31 @@
module ParserLayout
- require 'radius'
- include ParserCommon
+ require 'nokogiri'
- def parse_layout_contents(layout)
- content = layout.content.force_encoding('UTF-8')
- context = parser_layout_contents(layout)
- parser = Radius::Parser.new(context, :tag_prefix => 'r')
- parser.parse(content)
- end
+ def parse_body(layout)
+ body = Nokogiri::HTML(layout.body)
- def parser_layout_contents(layout)
- Radius::Context.new do |c|
- c.define_tag 'javascripts' do |tag|
- end
- c.define_tag 'stylesheets' do |tag|
- end
- c.define_tag 'ad_banner' do |tag|
- end
- c.define_tag 'menu' do |tag|
- layout.build_menu(:levels => 0, :values => {}) unless layout.menu
- layout.menu.levels = i = tag.attr['level'].to_i
- layout.menu.values.merge!({'home' => tag.attr['home']}) if i == 1
- layout.menu.values.merge!({"id_#{i}" => tag.attr['id'], "class_#{i}" => tag.attr['class'], "li_class_#{i}" => tag.attr['li_class'], "li_incremental_#{i}" => tag.attr['li_incremental']})
- tag.expand
- end
- c.define_tag 'content' do |tag|
- layout.layout_parts.new(:name => tag.attr['name'])
- end
- c.define_tag 'image' do |tag|
- image = layout.design.images.detect{ |i| i.file_identifier.eql?(parse_html_image(tag.expand)) }
- image.update_attributes(:name => tag.attr['name'], :html_id => tag.attr['id'], :html_class => tag.attr['class']) if image
- end
+ body.css('.page_content').each do |content|
+ layout.layout_parts.build(:name => content['name'])
end
+
+ body.css('.page_menu').each do |menu|
+ layout.build_menu(:levels => 0, :values => {}) unless layout.menu
+ layout.menu.levels = i = menu['level'].to_i
+ layout.menu.values.merge!({'home' => menu['home']}) if i == 1
+ layout.menu.values.merge!({"id_#{i}" => menu['id'], "class_#{i}" => menu['class'], "li_class_#{i}" => menu['li_class'], "li_incremental_#{i}" => menu['li_incremental']})
+ end
+
end
-
- def parse_html_image(html)
- html.scan(/(?<=\
)/){
- $1.gsub(' ','').scan(/(?<=src=\")(.*?)(?=\")/){
- return File.basename($1).gsub(/[\\\"]/, '')
- }
- }
+
+ def parse_body_for_images(design)
+ body = Nokogiri::HTML(design.layout.body)
+
+ body.css('.page_image').each do |page_image|
+ image = design.images.where( file: File.basename(page_image['src']))[0]
+ image.update_attributes(:name => File.basename(page_image['src']), :html_id => page_image['id'], :html_class => page_image['class']) if image
+ end
+
end
+
+
end
diff --git a/lib/tasks/anc_tasks.rake b/lib/tasks/anc_tasks.rake
index 3145d119..cd534b93 100644
--- a/lib/tasks/anc_tasks.rake
+++ b/lib/tasks/anc_tasks.rake
@@ -11,12 +11,12 @@ namespace :anc do
bulletin_category_3.create_i18n_variable(:en => "MattCheckChrisPreview", :zh_tw => 'MattCheckChrisPreview')
- bulletin_1 = Bulletin.create(:title => "C1P1",:status => nil,:subtitle => "",:text => "value",:postadate => Time.now,:deadline => nil,:bulletin_category => bulletin_category_1 )
- bulletin_2 = Bulletin.create(:title => "C1P2",:status => nil,:subtitle => "",:text => "value",:postadate => Time.now,:deadline => nil,:bulletin_category => bulletin_category_1 )
- bulletin_3 = Bulletin.create(:title => "C2P1",:status => nil,:subtitle => "",:text => "value",:postadate => Time.now,:deadline => nil,:bulletin_category => bulletin_category_2 )
- bulletin_4 = Bulletin.create(:title => "C2P2",:status => nil,:subtitle => "",:text => "value",:postadate => Time.now,:deadline => nil,:bulletin_category => bulletin_category_2 )
- bulletin_5 = Bulletin.create(:title => "C3P1",:status => nil,:subtitle => "",:text => "value",:postadate => Time.now,:deadline => nil,:bulletin_category => bulletin_category_3 )
- bulletin_6 = Bulletin.create(:title => "C3P2",:status => nil,:subtitle => "",:text => "value",:postadate => Time.now,:deadline => nil,:bulletin_category => bulletin_category_3 )
+ bulletin_1 = Bulletin.create(:title => "C1P1",:status => nil,:subtitle => "",:text => "value",:post_date => Time.now,:deadline => nil,:bulletin_category => bulletin_category_1 )
+ bulletin_2 = Bulletin.create(:title => "C1P2",:status => nil,:subtitle => "",:text => "value",:post_date => Time.now,:deadline => nil,:bulletin_category => bulletin_category_1 )
+ bulletin_3 = Bulletin.create(:title => "C2P1",:status => nil,:subtitle => "",:text => "value",:post_date => Time.now,:deadline => nil,:bulletin_category => bulletin_category_2 )
+ bulletin_4 = Bulletin.create(:title => "C2P2",:status => nil,:subtitle => "",:text => "value",:post_date => Time.now,:deadline => nil,:bulletin_category => bulletin_category_2 )
+ bulletin_5 = Bulletin.create(:title => "C3P1",:status => nil,:subtitle => "",:text => "value",:post_date => Time.now,:deadline => nil,:bulletin_category => bulletin_category_3 )
+ bulletin_6 = Bulletin.create(:title => "C3P2",:status => nil,:subtitle => "",:text => "value",:post_date => Time.now,:deadline => nil,:bulletin_category => bulletin_category_3 )
end
end
\ No newline at end of file
diff --git a/lib/tasks/noko.rake b/lib/tasks/noko.rake
new file mode 100644
index 00000000..b411fa30
--- /dev/null
+++ b/lib/tasks/noko.rake
@@ -0,0 +1,13 @@
+# encoding: utf-8
+
+namespace :nokogiri do
+ task :layout => :environment do
+ l = Design.first(:conditions => {:title => 'CCU'}).layout
+ l.layout_parts.destroy rescue nil
+ l.menu.destroy rescue nil
+ l.design.save
+ l = Design.first(:conditions => {:title => 'CCU'}).layout
+ l.file = File.open("#{Rails.root}/lib/noko/layout.html")
+ l.design.save
+ end
+end
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
index d648e2a2..841dedf0 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
@@ -93,7 +93,7 @@ class Panel::Announcement::BackEnd::BulletinCategorysController < OrbitBackendCo
respond_to do |format|
if @bulletin_category.update_attributes(params[:bulletin_category])
# format.html { redirect_to(panel_announcement_back_end_bulletin_category_url(@bulletin_category), :notice => t('bulletin_category.update_bulletin_category_success')) }
- format.html { redirect_to(panel_announcement_back_end_bulletin_categorys_url, :notice => t('bulletin_category.update_bulletin_category_success')) }
+ # format.html { redirect_to(panel_announcement_back_end_bulletin_categorys_url, :notice => t('bulletin_category.update_bulletin_category_success')) }
# format.xml { head :ok }
format.js
else
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_files_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_files_controller.rb
new file mode 100644
index 00000000..223e2ba5
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_files_controller.rb
@@ -0,0 +1,48 @@
+class Panel::Announcement::BackEnd::BulletinFilesController < ApplicationController
+
+ layout 'new_admin'
+
+ def index
+ @bulletin_files = BulletinFile.all
+
+ respond_to do |format|
+ format.html # index.html.erb
+ # format.xml { render :xml => @bulletins }
+ format.js
+ end
+
+ end
+
+ # POST /bulletins
+ # POST /bulletins.xml
+ def create
+ @bulletin_file = BulletinFile.new(params[:bulletin_file])
+
+ respond_to do |format|
+ if @bulletin_file.save
+ format.html { redirect_to(panel_announcement_back_end_bulletins_url) }
+ format.js
+ else
+ format.html { render :action => "new" }
+ format.js { render action: "new" }
+ end
+ end
+ end
+
+ # PUT /bulletins/1
+ # PUT /bulletins/1.xml
+ def update
+ @bulletin_file = BulletinFile.find(params[:id])
+
+ respond_to do |format|
+ if @bulletin_file.update_attributes(params[:bulletin_file])
+ format.html { redirect_to(panel_announcement_back_end_bulletins_url) }
+ format.js
+ else
+ format.html { render :action => "edit" }
+ format.js { render :action => "edit" }
+ end
+ end
+ end
+
+end
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_links_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_links_controller.rb
new file mode 100644
index 00000000..59f164d9
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_links_controller.rb
@@ -0,0 +1,49 @@
+class Panel::Announcement::BackEnd::BulletinLinksController < ApplicationController
+
+ layout 'new_admin'
+
+ def index
+ @bulletin_links = BulletinLink.all
+
+ respond_to do |format|
+ format.html # index.html.erb
+ # format.xml { render :xml => @bulletins }
+ format.js
+ end
+
+ end
+
+ # POST /bulletins
+ # POST /bulletins.xml
+ def create
+ @bulletin_link = BulletinLink.new(params[:bulletin_link])
+ # @bulletin_link.bulletin_id = params[:bulletin_link][:bulletin_id]
+
+ respond_to do |format|
+ if @bulletin_link.save
+ format.html { redirect_to(panel_announcement_back_end_bulletins_url) }
+ format.js
+ else
+ format.html { render :action => "new" }
+ format.js { render action: "new" }
+ end
+ end
+ end
+
+ # PUT /bulletins/1
+ # PUT /bulletins/1.xml
+ def update
+ @bulletin_link = BulletinLink.find(params[:id])
+
+ respond_to do |format|
+ if @bulletin_link.update_attributes(params[:bulletin_link])
+ format.html { redirect_to(panel_announcement_back_end_bulletins_url) }
+ format.js
+ else
+ format.html { render :action => "edit" }
+ format.js { render :action => "edit" }
+ end
+ end
+ end
+
+end
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
index a0cf8d96..a13e8308 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
@@ -9,20 +9,41 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
# @bulletins = Bulletin.all
# @bulletins = Bulletin.desc("postdate desc")
get_categorys(params[:bulletin_category_id])
-
+ get_tags
+
+ @filter = params[:filter]
+ new_filter = params[:new_filter]
+
+ if @filter && params[:clear]
+ @filter.delete(params[:type])
+ elsif @filter && new_filter
+ if @filter.has_key?(new_filter[:type]) && @filter[new_filter[:type]].include?(new_filter[:id].to_s)
+ @filter[new_filter[:type]].delete(new_filter[:id].to_s)
+ elsif @filter.has_key?(new_filter[:type])
+ @filter[new_filter[:type]] << new_filter[:id].to_s
+ else
+ @filter.merge!({new_filter[:type] => [new_filter[:id].to_s]})
+ end
+ elsif new_filter
+ @filter = {new_filter[:type] => [new_filter[:id].to_s]}
+ end
+
# @bulletins = Bulletin.where("bulletin_category_id" => params[:bulletin_category_id]).desc("postdate") if params[:bulletin_category_id]
# @bulletins = Bulletin.search(params[:search], params[:category_id])
# @bulletins = Bulletin.all.order_by([params[:sort], params[:direction]])
- @bulletins = params[:sort] ? get_sorted_bulletins : Bulletin.all
+ @bulletins = (params[:sort] || @filter) ? get_sorted_and_filtered_bulletins : Bulletin.all.page(params[:page]).per(10)
@bulletin_categories = BulletinCategory.all
-
- module_app = ModuleApp.first(:conditions => {:key => 'announcement'})
- @tags = Tag.all(:conditions => {:module_app_id => module_app.id}).order_by(I18n.locale, :asc)
+ @bulletin_link = BulletinLink.new
+ @link_url = panel_announcement_back_end_bulletins_path
+
+ @bulletin_file = BulletinFile.new
+ @file_url = panel_announcement_back_end_bulletins_path
+
respond_to do |format|
format.html # index.html.erb
- format.js
+ format.js { }
format.xml { render :xml => @bulletins }
end
end
@@ -31,6 +52,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
# GET /bulletins/1.xml
def show
@bulletin = Bulletin.find(params[:id])
+ get_tags
# get_categorys
# @bulletin_categorys = BulletinCategory.where("_id" => params[:id])
@@ -51,11 +73,14 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
# GET /bulletins/new.xml
def new
@bulletin = Bulletin.new
+
+ @link_url = panel_announcement_back_end_bulletins_path
# @bulletin.bulletin_files.build
# @bulletin.bulletin_files.new
get_categorys
+ get_tags
respond_to do |format|
format.html # new.html.erb
@@ -67,52 +92,168 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
def edit
@bulletin = Bulletin.find(params[:id])
# @summary_variable = @bulletin.summary_variable
+
+ @link_url = panel_announcement_back_end_bulletin_path(@bulletin)
+
get_categorys
+ get_tags
end
# POST /bulletins
# POST /bulletins.xml
def create
- @bulletin = Bulletin.new(params[:bulletin])
- @bulletin.create_user_id = current_user.id
- @bulletin.update_user_id = current_user.id
+ if params[:bulletin_link]
+
+ @bulletin_link = BulletinLink.new(params[:bulletin_link])
+ respond_to do |format|
+ if @bulletin_link.save
+ format.js { render 'create_bulletin_link' }
+ end
+ end
+
+ elsif params[:bulletin_file]
+
+ @bulletin_file = BulletinFile.new(params[:bulletin_file])
+
+ respond_to do |format|
+ if @bulletin_file.save
+ format.js { render 'create_bulletin_file' }
+ end
+ end
+
+ else
+
+ @bulletin = Bulletin.new(params[:bulletin])
+
+ @bulletin.create_user_id = current_user.id
+ @bulletin.update_user_id = current_user.id
+
+ respond_to do |format|
+ if @bulletin.save
+ # format.html { redirect_to(panel_announcement_back_end_bulletin_url(@bulletin), :notice => t('announcement.create_bulletin_success')) }
+ format.html { redirect_to(panel_announcement_back_end_bulletins_url, :notice => t('announcement.create_bulletin_success')) }
+ format.xml { render :xml => @bulletin, :status => :created, :location => @bulletin }
+ format.js
+ else
+ format.html { render :action => "new" }
+ format.xml { render :xml => @bulletin.errors, :status => :unprocessable_entity }
+ end
+ end
+
+ end
+
+ end
+
+ def link_quick_add
+ # debugger
+
+ @bulletin_link = BulletinLink.new
+ @link_url = panel_announcement_back_end_bulletins_path
+
+ @bulletin_link.bulletin_id = params[:bulletin_id]
+
respond_to do |format|
- if @bulletin.save
- # format.html { redirect_to(panel_announcement_back_end_bulletin_url(@bulletin), :notice => t('announcement.create_bulletin_success')) }
- format.html { redirect_to(panel_announcement_back_end_bulletins_url, :notice => t('announcement.create_bulletin_success')) }
- format.xml { render :xml => @bulletin, :status => :created, :location => @bulletin }
- else
- format.html { render :action => "new" }
- format.xml { render :xml => @bulletin.errors, :status => :unprocessable_entity }
- end
+ format.js
+ end
+
+ end
+
+ def link_quick_edit
+ # debugger
+ @bulletin_link = BulletinLink.find(params[:bulletin_id])
+
+ @link_url = panel_announcement_back_end_bulletin_path(@bulletin_link)
+
+ # @bulletin = Bulletin.find(params[:bulletin_id])
+
+ # @link_url = panel_announcement_back_end_bulletin_path(@bulletin)
+
+ respond_to do |format|
+ format.js
+ end
+
+ end
+
+ def file_quick_add
+ # debugger
+
+ @bulletin_file = BulletinFile.new
+ @file_url = panel_announcement_back_end_bulletins_path
+
+ @bulletin_file.bulletin_id = params[:bulletin_id]
+
+ respond_to do |format|
+ format.js
+ end
+
+ end
+
+ def file_quick_edit
+ # debugger
+ @bulletin_file = BulletinFile.find(params[:bulletin_id])
+
+ @file_url = panel_announcement_back_end_bulletin_path(@bulletin_file)
+
+ respond_to do |format|
+ format.js
end
end
# PUT /bulletins/1
# PUT /bulletins/1.xml
def update
- @bulletin = Bulletin.find(params[:id])
-
- @bulletin.update_user_id = current_user.id
-
- # @bulletin.image.clear if params[:bulletin][:image_del] == '1'
- if params[:bulletin][:image_del] == '1'
- @bulletin.remove_image!
- # @bulletin.image_del = nil
- params[:bulletin][:image_del] = nil
- end
- respond_to do |format|
- if @bulletin.update_attributes(params[:bulletin]) && @bulletin.save
- # format.html { redirect_to(panel_announcement_back_end_bulletin_url(@bulletin), :notice => t('bulletin.update_bulletin_success')) }
- format.html { redirect_to(panel_announcement_back_end_bulletins_url, :notice => t('bulletin.update_bulletin_success')) }
- format.js { render 'toggle_enable' }
- format.xml { head :ok }
- else
- format.html { render :action => "edit" }
- format.xml { render :xml => @bulletin.errors, :status => :unprocessable_entity }
+ if params[:bulletin_link]
+
+ @bulletin_link = BulletinLink.find(params[:id])
+
+ @link_url = panel_announcement_back_end_bulletin_path(@bulletin_link)
+
+ respond_to do |format|
+ if @bulletin_link.update_attributes(params[:bulletin_link])
+ # format.html { redirect_to(panel_announcement_back_end_bulletins_url) }
+ format.js { render 'update_bulletin_link' }
+ end
+ end
+
+ elsif params[:bulletin_file]
+
+ @bulletin_file = BulletinFile.find(params[:id])
+
+ @file_url = panel_announcement_back_end_bulletin_path(@bulletin_file)
+
+ respond_to do |format|
+ if @bulletin_file.update_attributes(params[:bulletin_file])
+ # format.html { redirect_to(panel_announcement_back_end_bulletins_url) }
+ format.js { render 'update_bulletin_file' }
+ end
+ end
+
+ else
+
+ @bulletin = Bulletin.find(params[:id])
+
+ @bulletin.update_user_id = current_user.id
+
+ # @bulletin.image.clear if params[:bulletin][:image_del] == '1'
+ # if params[:bulletin][:image_del] == '1'
+ # @bulletin.remove_image!
+ # @bulletin.image_del = nil
+ # params[:bulletin][:image_del] = nil
+ # end
+
+ respond_to do |format|
+ if @bulletin.update_attributes(params[:bulletin]) && @bulletin.save
+ # format.html { redirect_to(panel_announcement_back_end_bulletin_url(@bulletin), :notice => t('bulletin.update_bulletin_success')) }
+ format.html { redirect_to(panel_announcement_back_end_bulletins_url, :notice => t('bulletin.update_bulletin_success')) }
+ format.js { render 'toggle_enable' }
+ format.xml { head :ok }
+ else
+ format.html { render :action => "edit" }
+ format.xml { render :xml => @bulletin.errors, :status => :unprocessable_entity }
+ end
end
end
end
@@ -141,6 +282,21 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
# end
+
+ def load_quick_edit
+ @bulletin = Bulletin.find(params[:id])
+ @type = params[:type]
+ @bulletin_categories = BulletinCategory.all
+ get_tags
+ end
+
+ def delete
+ if params[:to_delete]
+ bulletins = Bulletin.any_in(:_id => params[:to_delete]).delete_all
+ end
+ redirect_to panel_announcement_back_end_bulletins_url(:filter => params[:filter], :direction => params[:direction], :sort => params[:sort])
+ end
+
protected
@@ -152,12 +308,17 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
@bulletin_categorys = BulletinCategory.authed_for_user(current_user,'submit_new')
end
end
+
+ def get_tags
+ module_app = ModuleApp.first(:conditions => {:key => 'announcement'})
+ @tags = Tag.all(:conditions => {:module_app_id => module_app.id}).order_by(I18n.locale, :asc)
+ end
- def get_sorted_bulletins
+ def get_sorted_and_filtered_bulletins
bulletins = Bulletin.all
case params[:sort]
when 'postdate', 'deadline'
- bulletins.order_by([params[:sort], params[:direction]])
+ bulletins = bulletins.order_by([params[:sort], params[:direction]])
when 'category'
category_ids = bulletins.distinct(:bulletin_category_id)
categories = BulletinCategory.find(category_ids) rescue nil
@@ -166,37 +327,66 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
categories.each { |category| h[category.i18n_variable[I18n.locale]] = category.id }
sorted = params[:direction].eql?('asc') ? h.sort : h.sort.reverse!
sorted_categorys = sorted.collect {|a| bulletins.where(:bulletin_category_id => a[1]).entries }
- sorted_categorys.flatten
- else
- nil
+ bulletins = sorted_categorys.flatten!
end
when 'title'
- h = Hash.new
- bulletins.each { |bulletin| h[bulletin.title[I18n.locale]] = bulletin }
+ h = Array.new
+ bulletins.each { |bulletin| h << [bulletin.title[I18n.locale].downcase, bulletin] }
sorted = params[:direction].eql?('asc') ? h.sort : h.sort.reverse!
- sorted.collect {|a| a[1] }
+ bulletins = sorted.collect {|a| a[1] }
when 'status'
- bulletins.order_by(:is_top, params[:direction]).order_by(:is_hot, params[:direction]).order_by(:is_hidden, params[:direction])
+ bulletins = bulletins.order_by(:is_top, params[:direction]).order_by(:is_hot, params[:direction]).order_by(:is_hidden, params[:direction])
when 'update_user_id'
user_ids = bulletins.distinct(:update_user_id)
users = User.find(user_ids) rescue nil
if users
- h = Hash.new
- users.each { |user| h[user.name] = user.id }
+ h = Array.new
+ users.each { |user| h << [user.name, user.id] }
sorted = params[:direction].eql?('asc') ? h.sort : h.sort.reverse!
sorted_users = sorted.collect {|a| bulletins.where(:update_user_id => a[1]).entries }
- sorted_users.flatten
- else
- nil
+ bulletins = sorted_users.flatten
end
when 'tags'
a = Array.new
AnnouncementTag.all.order_by(I18n.locale, params[:direction]).each { |tag| a << tag.bulletins }
a.flatten!
- a.uniq
+ a.uniq!
+ tmp = Array.new
+ bulletins.where(:tag_ids => []).each { |bulletin| tmp << [bulletin.title[I18n.locale].downcase, bulletin] }
+ sorted = params[:direction].eql?('asc') ? tmp.sort : tmp.sort.reverse!
+ sorted_titles = sorted.collect {|a| a[1] }
+ a = params[:direction].eql?('asc') ? (sorted_titles + a) : (a + sorted_titles)
+ bulletins = a.flatten
end
-
+ if @filter
+ @filter.each do |key, value|
+ case key
+ when 'status'
+ a = Array.new
+ bulletins.each do |bulletin|
+ value.each do |v|
+ a << bulletin if bulletin[v]
+ end
+ end
+ bulletins = a
+ when 'categories'
+ a = Array.new
+ bulletins.each do |bulletin|
+ a << bulletin if value.include?(bulletin.bulletin_category.id.to_s)
+ end
+ bulletins = a
+ when 'tags'
+ a = Array.new
+ bulletins.each do |bulletin|
+ bulletin.tags.each do |tag|
+ a << bulletin if value.include?(tag.id.to_s)
+ end
+ end
+ bulletins = a
+ end if value.size > 0
+ end
+ end
+ Kaminari.paginate_array(bulletins).page(params[:page]).per(10)
end
-
end
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/fact_checks_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/fact_checks_controller.rb
index dd471958..606225e9 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/fact_checks_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/fact_checks_controller.rb
@@ -1,38 +1,75 @@
class Panel::Announcement::BackEnd::FactChecksController < OrbitBackendController
before_filter :authenticate_user!
include AdminHelper
- layout 'admin'
+ # layout 'admin'
- def index
- @bulletin_categorys_submit_new = []
- @bulletin_categorys_check =[]
- if is_admin? || is_manager?
- #@bulletin_categorys_submit_new = BulletinCategory.all
- @bulletin_categorys_check = BulletinCategory.all
- # elsif is_sub_manager?
- # @bulletin_categorys_submit_new = BulletinCategory.authed_for_user(current_user,'submit_new')
- # @bulletin_categorys_check = BulletinCategory.authed_for_user(current_user,'fact_check')
+ def setting
+ @bulletin_categorys = BulletinCategory.all
+ if params.has_key?(:category_id)
+ first_category = BulletinCategory.find params[:category_id]
+ if params[:commit] == 'Update'
+ privilege_users = params[:users].collect{|key,value| User.find key } rescue []
+ preload_object_auth_ary = first_category.object_auths.where(title: 'fact_check') || (first_category.object_auths.create :title=> 'fact_check')
+ preload_object_auth = preload_object_auth_ary.first
+ preload_object_auth.privilege_users = privilege_users
+ preload_object_auth.save!
+ end
+ else
+ first_category = @bulletin_categorys.first
+ end
+ preload_object_auth = first_category.object_auths.where(title: 'fact_check').empty?? (first_category.object_auths.create! :title=> 'fact_check') : first_category.object_auths.where(title: 'fact_check')
+ @users_array = preload_object_auth.first.privilege_users rescue []
+ respond_to do |format|
+ format.html
+ format.js
end
end
- def new
+ def update_setting
end
-
- def create
-
+ # def index
+ # get_categorys(params[:bulletin_category_id])
+ #
+ # @bulletins = params[:sort] ? get_sorted_bulletins : Bulletin.all
+ # @bulletin_categories = BulletinCategory.all
+ #
+ # module_app = ModuleApp.first(:conditions => {:key => 'announcement'})
+ # @tags = Tag.all(:conditions => {:module_app_id => module_app.id}).order_by(I18n.locale, :asc)
+ #
+ # respond_to do |format|
+ # format.html # index.html.erb
+ # format.js
+ # format.xml { render :xml => @bulletins }
+ # end
+ # end
+ #
+ # def new
+ #
+ # end
+ #
+ # def create
+ #
+ # end
+ #
+ # def update
+ #
+ # end
+ #
+ # def edit
+ #
+ # end
+ #
+ # def destroy
+ #
+ # end
+ protected
+ def get_categorys(id = nil)
+ @bulletin_categorys = []
+ if(is_manager? || is_admin?)
+ @bulletin_categorys = (id ? BulletinCategory.find(id).to_a : BulletinCategory.excludes('disabled' => true))
+ elsif is_sub_manager?
+ @bulletin_categorys = BulletinCategory.authed_for_user(current_user,'submit_new')
+ end
end
-
- def update
-
- end
-
- def edit
-
- end
-
- def destroy
-
- end
-
end
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
index c0be3639..3ba0e666 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
@@ -2,7 +2,7 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
def initialize
super
- @app_title = NewBlog::MOUDLEAPP_TITLE
+ @app_title = 'announcement'
end
# GET /bulletins
@@ -11,19 +11,19 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
def index
date_now = Time.now
- if params[:bulletin_category_id]
- @bulletins = Bulletin.where(:bulletin_category_id => params[:bulletin_category_id]).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(10)
+ if params[:category_id]
+ @bulletins = Bulletin.can_display.where(:bulletin_category_id => params[:category_id]).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(10)
else
- @bulletins = Bulletin.any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(10)
+ @bulletins = Bulletin.can_display.any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).page( params[:page]).per(10)
end
get_categorys
- @current_category = BulletinCategory.from_id(params[:bulletin_category_id]) rescue nil
+ @current_category = BulletinCategory.from_id(params[:category_id]) rescue nil
end
def show
- @bulletin = Bulletin.find(params[:id])
+ @bulletin = Bulletin.can_display.where.where(_id: params[:id])
get_categorys
end
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
index cb18fa23..96277c5e 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
@@ -2,7 +2,7 @@ class Panel::Announcement::Widget::BulletinsController < OrbitWidgetController
def initialize
super
- @app_title = NewBlog::MOUDLEAPP_TITLE
+ @app_title = 'announcement'
end
# GET /bulletins
@@ -14,9 +14,9 @@ class Panel::Announcement::Widget::BulletinsController < OrbitWidgetController
# @bulletin_categorys = BulletinCategory.first;
# @bulletins = Bulletin.widget_datas(@bulletin_categorys.id).limit(9)
if params[:category_id]
- @bulletins = Bulletin.where(:bulletin_category_id => params[:category_id]).widget_datas.limit(9)
+ @bulletins = Bulletin.can_display.where(:bulletin_category_id => params[:category_id]).widget_datas.limit(9)
else
- @bulletins = Bulletin.widget_datas.limit(9)
+ @bulletins = Bulletin.can_display.widget_datas.limit(9)
end
get_categorys
@@ -26,13 +26,14 @@ class Panel::Announcement::Widget::BulletinsController < OrbitWidgetController
def bulletins_and_web_links
@tags = AnnouncementTag.all
@selected_tag = AnnouncementTag.find(params[:id]) rescue @tags[0]
- @bulletins = @selected_tag.get_visible_bulletins.page(params[:page]).per(5) rescue nil
+ @bulletins = @selected_tag.get_visible_bulletins.can_display.page(params[:page]).per(5) rescue nil
@web_links = WebResourceTag.first(:conditions => {:en => @selected_tag[:en]}).get_visible_links.page(params[:page]).per(5) rescue nil
+ render :layout => 'module_widget'
end
def reload_bulletins
@selected_tag = AnnouncementTag.find(params[:tag_id])
- @bulletins = @selected_tag.get_visible_bulletins.page(params[:page]).per(5) rescue nil
+ @bulletins = @selected_tag.get_visible_bulletins.can_display.page(params[:page]).per(5) rescue nil
end
def reload_web_links
diff --git a/vendor/built_in_modules/announcement/app/models/bulletin - ƻs.rb b/vendor/built_in_modules/announcement/app/models/bulletin - ƻs.rb
deleted file mode 100644
index c65e65f7..00000000
--- a/vendor/built_in_modules/announcement/app/models/bulletin - ƻs.rb
+++ /dev/null
@@ -1,101 +0,0 @@
-# encoding: utf-8
-
-class Bulletin
- include Mongoid::Document
- include Mongoid::Timestamps
- include Mongoid::MultiParameterAttributes
-
- # field :category_id, :type => Integer
- field :title
- # has_one :title_variable, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
- # has_one :subtitle_variable, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
- # has_one :text_variable, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
- field :subtitle
- field :text
- field :postdate , :type => Date
- field :deadline , :type => Date
- # field :url
- field :create_user_id
- field :update_user_id
-
- field :is_top, :type => Boolean, :default => false
-
- mount_uploader :image, ImageUploader
-
- belongs_to :bulletin_category
-
- embeds_many :bulletin_links, :cascade_callbacks => true
- embeds_many :bulletin_files, :cascade_callbacks => true
-
- # has_many :bulletin_files, :autosave => true, :dependent => :destroy
-
- accepts_nested_attributes_for :bulletin_files, :allow_destroy => true
- accepts_nested_attributes_for :bulletin_links, :allow_destroy => true
-
- # validates_presence_of :title_variable
- validates_presence_of :title
-
- after_save :save_bulletin_links
- after_save :save_bulletin_files
-
-
- def self.search( search = nil, category_id = nil )
-
- if category_id.to_s.size > 0 and search.to_s.size > 0
-
- key = /#{search}/
-
- find(:all, :conditions => {title: key, bulletin_category_id: category_id}).desc( :is_top, :postdate )
-
- elsif category_id.to_s.size > 0 and search.to_s.size < 1
-
- find(:all, :conditions => {bulletin_category_id: category_id}).desc( :is_top, :postdate )
-
- elsif search.to_s.size > 0 and category_id.to_s.size < 1
-
- key = /#{search}/
-
- find(:all, :conditions => {title: key}).desc( :is_top, :postdate )
- else
-
- find(:all).desc( :is_top, :postdate)
-
- end
-
- end
-
-
- def self.widget_datas
-
- date_now = Time.now
-
- # find(:all, :conditions => {:postdate => {"$lte" => Date.today}, deadline: nil} ).desc( :is_top, :postdate)
- # where( :postdate.lte => date_now ).where( :deadline => nil ).desc(:is_top, :postdate)
- # any_of({ :title => "test" },{:deadline => nil, :title => "123"})
- any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).limit(5)
-
-
- end
-
-
- def is_top?
- self.is_top
- end
-
- def save_bulletin_links
- self.bulletin_links.each do |t|
- if t.should_destroy
- t.destroy
- end
- end
- end
-
- def save_bulletin_files
- self.bulletin_files.each do |t|
- if t.should_destroy
- t.destroy
- end
- end
- end
-
-end
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/models/bulletin.rb b/vendor/built_in_modules/announcement/app/models/bulletin.rb
index 188142ea..4808b3a9 100644
--- a/vendor/built_in_modules/announcement/app/models/bulletin.rb
+++ b/vendor/built_in_modules/announcement/app/models/bulletin.rb
@@ -19,17 +19,23 @@ class Bulletin
field :is_top, :type => Boolean, :default => false
field :is_hot, :type => Boolean, :default => false
field :is_hidden, :type => Boolean, :default => false
+ field :is_checked, :type => Boolean, :default => nil
+
+ field :not_checked_reason
field :public, :type => Boolean, :default => true
+ scope :can_display,where(is_checked: true)
+
mount_uploader :image, ImageUploader
belongs_to :bulletin_category
- embeds_many :bulletin_links, :cascade_callbacks => true
- embeds_many :bulletin_files, :cascade_callbacks => true
+ # embeds_many :bulletin_links, :cascade_callbacks => true
+ # embeds_many :bulletin_files, :cascade_callbacks => true
- # has_many :bulletin_files, :autosave => true, :dependent => :destroy
+ has_many :bulletin_links, :autosave => true, :dependent => :destroy
+ has_many :bulletin_files, :autosave => true, :dependent => :destroy
accepts_nested_attributes_for :bulletin_files, :allow_destroy => true
accepts_nested_attributes_for :bulletin_links, :allow_destroy => true
@@ -38,30 +44,22 @@ class Bulletin
before_save :set_key
+ after_save :save_bulletin_links
+ after_save :save_bulletin_files
+
def self.search( search = nil, category_id = nil )
-
- if category_id.to_s.size > 0 and search.to_s.size > 0
-
+ if category_id.to_s.size > 0 and search.to_s.size > 0
key = /#{search}/
-
- find(:all, :conditions => {title: key, bulletin_category_id: category_id}).desc( :is_top, :postdate )
-
- elsif category_id.to_s.size > 0 and search.to_s.size < 1
-
- find(:all, :conditions => {bulletin_category_id: category_id}).desc( :is_top, :postdate )
-
- elsif search.to_s.size > 0 and category_id.to_s.size < 1
-
+ find(:all, :conditions => {title: key, bulletin_category_id: category_id}).desc( :is_top, :postdate )
+ elsif category_id.to_s.size > 0 and search.to_s.size < 1
+ find(:all, :conditions => {bulletin_category_id: category_id}).desc( :is_top, :postdate )
+ elsif search.to_s.size > 0 and category_id.to_s.size < 1
key = /#{search}/
-
- find(:all, :conditions => {title: key}).desc( :is_top, :postdate )
- else
-
- find(:all).desc( :is_top, :postdate)
-
- end
-
+ find(:all, :conditions => {title: key}).desc( :is_top, :postdate )
+ else
+ find(:all).desc( :is_top, :postdate)
+ end
end
@@ -80,7 +78,22 @@ class Bulletin
end
end
-
+
+ def status
+ case self.is_checked
+ when nil
+ I18n.t('announcement.bulletin.fact_check_pending')
+ when true
+ I18n.t('announcement.bulletin.fact_check_pass')
+ when false
+ I18n.t('announcement.bulletin.fact_check_not_pass')
+ end
+ end
+
+ def is_expired?
+ Date.today > self.deadline ? true : false rescue false
+ #some dates might sat as nil so rescue false
+ end
def is_top?
self.is_top
@@ -94,6 +107,31 @@ class Bulletin
self.is_hidden
end
+ def is_checked?
+ self.is_checked
+ end
+
+ def is_check_rejected?
+ self.is_checked == false
+ end
+
+
+ def save_bulletin_links
+ self.bulletin_links.each do |t|
+ if t.should_destroy
+ t.destroy
+ end
+ end
+ end
+
+ def save_bulletin_files
+ self.bulletin_files.each do |t|
+ if t.should_destroy
+ t.destroy
+ end
+ end
+ end
+
def title
@title ||= I18nVariable.first(:conditions => {:key => 'title', :language_value_id => self.id, :language_value_type => self.class}) rescue nil
diff --git a/vendor/built_in_modules/announcement/app/models/bulletin_file.rb b/vendor/built_in_modules/announcement/app/models/bulletin_file.rb
index 28062d40..c4d60b9b 100644
--- a/vendor/built_in_modules/announcement/app/models/bulletin_file.rb
+++ b/vendor/built_in_modules/announcement/app/models/bulletin_file.rb
@@ -5,13 +5,36 @@ class BulletinFile
mount_uploader :file, AssetUploader
- field :filetitle
- field :description
+ # field :filetitle
+ # field :description
+ has_one :filetitle, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
+ has_one :description, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
# field :to_save, :type => Boolean
field :should_destroy, :type => Boolean
- # belongs_to :bulletin
- embedded_in :bulletin
+ belongs_to :bulletin
+ # embedded_in :bulletin
+
+ before_save :set_key
+
+ def filetitle
+ @filetitle ||= I18nVariable.first(:conditions => {:key => 'filetitle', :language_value_id => self.id, :language_value_type => self.class}) rescue nil
+ end
+
+ def description
+ @description ||= I18nVariable.first(:conditions => {:key => 'description', :language_value_id => self.id, :language_value_type => self.class}) rescue nil
+ end
+
+ protected
+
+ def set_key
+ if filetitle.new_record?
+ filetitle.key = 'filetitle'
+ end
+ if description.new_record?
+ description.key = 'description'
+ end
+ end
end
diff --git a/vendor/built_in_modules/announcement/app/models/bulletin_link.rb b/vendor/built_in_modules/announcement/app/models/bulletin_link.rb
index a999d45d..30363182 100644
--- a/vendor/built_in_modules/announcement/app/models/bulletin_link.rb
+++ b/vendor/built_in_modules/announcement/app/models/bulletin_link.rb
@@ -4,10 +4,12 @@ class BulletinLink
include Mongoid::Timestamps
field :url
- field :name
+ # field :name
+
+ has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy
field :should_destroy, :type => Boolean
- embedded_in :bulletin
-
+ # embedded_in :bulletin
+ belongs_to :bulletin
end
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb
index e834ec60..7f1b5626 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb
@@ -1,21 +1,16 @@
-
- <%= bulletin_category.key %>
- <% @site_valid_locales.each do |locale| %>
- <%= bulletin_category.i18n_variable[locale] rescue nil %>
- <% end %>
- <%= bulletin_category.display %>
- <% if is_manager? %>
+
- <%= link_to t('blog.new_auth'), init_admin_object_auths_path("BulletinCategory",bulletin_category,:token => @module_app.token) %>
+
+ <%= link_to t('bulletin_category.edit'), edit_panel_announcement_back_end_bulletin_category_path(bulletin_category), :remote => true %>
+ <%= link_to t('bulletin_category.delete'), panel_announcement_back_end_bulletin_category_path(bulletin_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %>
+
+
-
- <% end %>
- <%= link_to t('bulletin_category.edit'), edit_panel_announcement_back_end_bulletin_category_path(bulletin_category), :remote => true %> |
- <%= link_to t('bulletin_category.quick_edit'), panel_announcement_back_end_bulletin_category_quick_edit_path(bulletin_category), :remote => true %> |
- <%= link_to t('bulletin_category.delete'), panel_announcement_back_end_bulletin_category_path(bulletin_category), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %>
-
-
\ No newline at end of file
+ <% @site_valid_locales.each do |locale| %>
+ <%= bulletin_category.i18n_variable[locale] rescue nil %>
+ <% end %>
+ <%= bulletin_category.display %>
+
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_form.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_form.html.erb
index d7bfac7b..df0dc38c 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_form.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_form.html.erb
@@ -1,36 +1,36 @@
<% # encoding: utf-8 %>
<%= form_for(@bulletin_category, :remote => true, :url => @url) do |f| %>
-<%#= form_for(@bulletin_category, :remote => true, :url => panel_announcement_back_end_bulletin_category_path(@bulletin_category)) do |f| %>
-
- <%= f.label :key %>
-
-
- <%= f.label :name %>
-
-
- <%= f.label :display %>
<%= (@bulletin_category.new_record? ? 'Add' : 'Edit') %>
- <%= f.radio_button :display, "List" %>List
- <%#= f.label :display, 'list', :value => '1', :checked => @a %>
- <%= f.radio_button :display, "Picture" %>Picture
- <%#= f.label :display, 'picture', :value => '2', :checked => @b %>
-
+ <%= f.label :key %>
+ <%= f.text_field :key %>
+
+
+
+
+
+ <%#= f.label :display %>
+ <%#= f.radio_button :display, "List" List%>
+ <%#= f.radio_button :display, "Picture" Picture%>
+ <%#
-
- <%= f.submit %>
+
+ <%= f.submit t('submit'), :class=>'btn btn-primary' %>
<% end %>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_form1.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_form1.html.erb
deleted file mode 100644
index 1499192b..00000000
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_form1.html.erb
+++ /dev/null
@@ -1,35 +0,0 @@
-<% # encoding: utf-8 %>
-
-
-
-
- <%= f.label :key %>
-
-
- <%= f.label :name %>
-
-
- <%= f.label :display %>
-
-
- <%= f.submit %>
-
-
-
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_quick_edit_qe.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_quick_edit_qe.html.erb
new file mode 100644
index 00000000..cb32d861
--- /dev/null
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_quick_edit_qe.html.erb
@@ -0,0 +1,28 @@
+<% # encoding: utf-8 %>
+
+
+
+
+ <%= f.label :key %>
+ <%= f.text_field :key %>
+
+
+
+
+ <%= f.label :display %>
+ <%= f.radio_button :display, "List" %>List
+ <%= f.radio_button :display, "Picture" %>Picture
+
+
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/index.html.erb
index 87b30a04..0a6e7f83 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/index.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/index.html.erb
@@ -1,38 +1,23 @@
-<% content_for :secondary do %>
-<%= render :partial => '/panel/announcement/back_end/announcement_secondary' %>
-<% end -%>
<%= flash_messages %>
-
-
-
-
-
+
+
+
+ <%= t('bulletin_category.key') %>
+ <% @site_valid_locales.each do |locale| %>
+ <%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %>
+ <% end %>
+ <%= t('bulletin_category.display') %>
+
+
+
-<%= t('bulletin_category.list_announcement_class') %>
-
-
-
- <%= t('bulletin_category.key') %>
- <% @site_valid_locales.each do |locale| %>
- <%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %>
- <% end %>
- <%= t('bulletin_category.display') %>
- <%= t('bulletin.action') %>
-
-
-<%# @bulletin_categorys.each do |post| %>
<%= render :partial => 'bulletin_category', :collection => @bulletin_categorys %>
-<%# end %>
+
+
-Add New
<%= render :partial => "form" %>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/quick_edit.js.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/quick_edit.js.erb
deleted file mode 100644
index 7db1d0f8..00000000
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/quick_edit.js.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-$.each($(".quick_edit"),function(obj){ $(this).remove(); });
-$("#<%= dom_id @bulletin_category %>").append("<%= j render "form" %>
");
-//$("#form > form").replaceWith("<%= j render "form" %>");
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
index 3f6f50e1..ca80512e 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
@@ -1,5 +1,5 @@
- <%= check_box_tag 'to_delete[]', bulletin.id, false, :class => "checkbox_in_list" %>
<% if bulletin.is_top? %>
<%= t(:top) %>
@@ -10,39 +10,46 @@
<% if bulletin.is_hidden? %>
<%= t(:hidden) %>
<% end %>
+ <%= bulletin.status %>
+
+ <%= bulletin.bulletin_category.i18n_variable[I18n.locale] %>
+
+ <%= link_to bulletin.title[I18n.locale], panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category.id) rescue ''%>
+ <% unless bulletin.is_check_rejected?%>
<%= link_to t('bulletin.edit'), edit_panel_announcement_back_end_bulletin_path(bulletin) %>
<%= t(:quick_edit) %>
+ <%#= debugger %>
+ <%#= a=1 %>
+ <% if (bulletin.bulletin_category.authed_users('fact_check').include?(current_user) or is_manager?) and !bulletin.is_expired? %>
+ <%= link_to t('bulletin.fact_check'), edit_panel_announcement_back_end_bulletin_path(bulletin) %> <%#= #TODO add ancher so user can quick access into that part %>
+ <% end %>
+ <% end %>
<%= link_to t('bulletin.delete'), panel_announcement_back_end_bulletin_path(bulletin), :confirm => t('announcement.sure?'), :method => :delete, :remote => true %>
- <%= bulletin.bulletin_category.i18n_variable[I18n.locale] %>
- <%= link_to bulletin.title[I18n.locale], panel_announcement_back_end_bulletin_path(bulletin) %>
<%= bulletin.postdate %>
<%= (bulletin.deadline) ? bulletin.deadline : t('bulletin.no_deadline') %>
- <% bulletin.sorted_tags.each do |tag| %>
- <%= tag[I18n.locale] %>
- <% end %>
+
+
+ <% bulletin.sorted_tags.each do |tag| %>
+ <%= tag[I18n.locale] %>
+ <% end %>
+
+
- <%= User.from_id(bulletin.update_user_id).name %>
+ <%= User.from_id(bulletin.update_user_id).name rescue ''%>
-
-<%= render :partial => 'quick_edit', :locals => {:bulletin => bulletin} %>
-
-<% content_for :page_specific_javascript do %>
-
-<% end %>
\ No newline at end of file
+" class='list_item'>
-
- <%= f.label :file %>
- <%#= file_field_tag 'bulletin[file]' %>
- <%= f.file_field :file %>
-
- <%= f.label :file_title %>
- <%= f.text_field :filetitle %>
-
- <%= f.label :file_description %>
- <%= f.text_field :description %>
-
-
- <% if bulletin_file.new_record? %>
- <%= t(:delete) %>
- <% else %>
- <%= f.hidden_field :id %>
- <%= t(:delete) %>
- <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %>
- <% end %>
-
-
-
+
+
+ <%= f.file_field :file %>
+
+
+
+ <%= f.fields_for :filetitle, (@bulletin_file.new_record? ? @bulletin_file.build_filetitle : @bulletin_file.filetitle ) do |f| %>
+ <% @site_valid_locales.each do |locale| %>
+
+
Name <%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %>
+
+ <%= f.text_field locale, :id => "file-#{locale}", :class => "input-xlarge" %>
+
+
+ <% end %>
+ <% end %>
+
+ <%= f.fields_for :description, (@bulletin_file.new_record? ? @bulletin_file.build_description : @bulletin_file.description ) do |f| %>
+ <% @site_valid_locales.each do |locale| %>
+
+
Description <%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %>
+
+ <%= f.text_field locale, :id => "file-#{locale}", :class => "input-xlarge" %>
+
+
+ <% end %>
+ <% end %>
+
+
" class='list_item'>
-
-
- <%= f.label :link_url %>
- <%= f.text_field :url %>
-
- <%= f.label :link_name %>
- <%= f.text_field :name %>
-
-
- <% if bulletin_link.new_record? %>
- <%= t(:delete) %>
- <% else %>
- <%= f.hidden_field :id %>
- <%= t(:delete) %>
- <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %>
- <% end %>
-
-
-
+
+
URL
+
+ <%= f.text_field :url %>
+
+
+
+ <%= f.fields_for :i18n_variable, (@bulletin_link.new_record? ? @bulletin_link.build_i18n_variable : @bulletin_link.i18n_variable) do |f| %>
+ <% @site_valid_locales.each do |locale| %>
+
+ <%= label_tag "link-#{locale}", "Name-#{I18nVariable.from_locale(locale)}", :class => 'control-label' %>
+
+ <%#= f.text_field locale, :class => 'input-xxlarge' %>
+ <%= f.text_field locale %>
+
+
+ <% end %>
+ <% end %>
+
+
+ 
<%#= image_tag current_user.avatar.thumb.url, :class => 'member-img' %>
+ 
+
+