From abde9ee8690626fd554e1c81832f720121fe3081 Mon Sep 17 00:00:00 2001 From: Macartur Sousa Date: Sun, 23 Aug 2015 21:33:30 -0300 Subject: [PATCH] Removed feed view and url and change error message --- colab_spb/static/spb/js/jquery.timeago.js | 221 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- colab_spb/templates/feed_repository.html | 26 -------------------------- colab_spb/tests/test_get_list.py | 6 +++--- colab_spb/urls.py | 4 +--- colab_spb/views.py | 24 +++--------------------- 5 files changed, 7 insertions(+), 274 deletions(-) delete mode 100644 colab_spb/static/spb/js/jquery.timeago.js delete mode 100644 colab_spb/templates/feed_repository.html diff --git a/colab_spb/static/spb/js/jquery.timeago.js b/colab_spb/static/spb/js/jquery.timeago.js deleted file mode 100644 index 15805a6..0000000 --- a/colab_spb/static/spb/js/jquery.timeago.js +++ /dev/null @@ -1,221 +0,0 @@ -/** - * Timeago is a jQuery plugin that makes it easy to support automatically - * updating fuzzy timestamps (e.g. "4 minutes ago" or "about 1 day ago"). - * - * @name timeago - * @version 1.4.1 - * @requires jQuery v1.2.3+ - * @author Ryan McGeary - * @license MIT License - http://www.opensource.org/licenses/mit-license.php - * - * For usage and examples, visit: - * http://timeago.yarp.com/ - * - * Copyright (c) 2008-2015, Ryan McGeary (ryan -[at]- mcgeary [*dot*] org) - */ - -(function (factory) { - if (typeof define === 'function' && define.amd) { - // AMD. Register as an anonymous module. - define(['jquery'], factory); - } else { - // Browser globals - factory(jQuery); - } -}(function ($) { - $.timeago = function(timestamp) { - if (timestamp instanceof Date) { - return inWords(timestamp); - } else if (typeof timestamp === "string") { - return inWords($.timeago.parse(timestamp)); - } else if (typeof timestamp === "number") { - return inWords(new Date(timestamp)); - } else { - return inWords($.timeago.datetime(timestamp)); - } - }; - var $t = $.timeago; - - $.extend($.timeago, { - settings: { - refreshMillis: 60000, - allowPast: true, - allowFuture: false, - localeTitle: false, - cutoff: 0, - strings: { - prefixAgo: null, - prefixFromNow: null, - suffixAgo: "ago", - suffixFromNow: "from now", - inPast: 'any moment now', - seconds: "less than a minute", - minute: "about a minute", - minutes: "%d minutes", - hour: "about an hour", - hours: "about %d hours", - day: "a day", - days: "%d days", - month: "about a month", - months: "%d months", - year: "about a year", - years: "%d years", - wordSeparator: " ", - numbers: [] - } - }, - - inWords: function(distanceMillis) { - if(!this.settings.allowPast && ! this.settings.allowFuture) { - throw 'timeago allowPast and allowFuture settings can not both be set to false.'; - } - - var $l = this.settings.strings; - var prefix = $l.prefixAgo; - var suffix = $l.suffixAgo; - if (this.settings.allowFuture) { - if (distanceMillis < 0) { - prefix = $l.prefixFromNow; - suffix = $l.suffixFromNow; - } - } - - if(!this.settings.allowPast && distanceMillis >= 0) { - return this.settings.strings.inPast; - } - - var seconds = Math.abs(distanceMillis) / 1000; - var minutes = seconds / 60; - var hours = minutes / 60; - var days = hours / 24; - var years = days / 365; - - function substitute(stringOrFunction, number) { - var string = $.isFunction(stringOrFunction) ? stringOrFunction(number, distanceMillis) : stringOrFunction; - var value = ($l.numbers && $l.numbers[number]) || number; - return string.replace(/%d/i, value); - } - - var words = seconds < 45 && substitute($l.seconds, Math.round(seconds)) || - seconds < 90 && substitute($l.minute, 1) || - minutes < 45 && substitute($l.minutes, Math.round(minutes)) || - minutes < 90 && substitute($l.hour, 1) || - hours < 24 && substitute($l.hours, Math.round(hours)) || - hours < 42 && substitute($l.day, 1) || - days < 30 && substitute($l.days, Math.round(days)) || - days < 45 && substitute($l.month, 1) || - days < 365 && substitute($l.months, Math.round(days / 30)) || - years < 1.5 && substitute($l.year, 1) || - substitute($l.years, Math.round(years)); - - var separator = $l.wordSeparator || ""; - if ($l.wordSeparator === undefined) { separator = " "; } - return $.trim([prefix, words, suffix].join(separator)); - }, - - parse: function(iso8601) { - var s = $.trim(iso8601); - s = s.replace(/\.\d+/,""); // remove milliseconds - s = s.replace(/-/,"/").replace(/-/,"/"); - s = s.replace(/T/," ").replace(/Z/," UTC"); - s = s.replace(/([\+\-]\d\d)\:?(\d\d)/," $1$2"); // -04:00 -> -0400 - s = s.replace(/([\+\-]\d\d)$/," $100"); // +09 -> +0900 - return new Date(s); - }, - datetime: function(elem) { - var iso8601 = $t.isTime(elem) ? $(elem).attr("datetime") : $(elem).attr("title"); - return $t.parse(iso8601); - }, - isTime: function(elem) { - // jQuery's `is()` doesn't play well with HTML5 in IE - return $(elem).get(0).tagName.toLowerCase() === "time"; // $(elem).is("time"); - } - }); - - // functions that can be called via $(el).timeago('action') - // init is default when no action is given - // functions are called with context of a single element - var functions = { - init: function(){ - var refresh_el = $.proxy(refresh, this); - refresh_el(); - var $s = $t.settings; - if ($s.refreshMillis > 0) { - this._timeagoInterval = setInterval(refresh_el, $s.refreshMillis); - } - }, - update: function(time){ - var parsedTime = $t.parse(time); - $(this).data('timeago', { datetime: parsedTime }); - if($t.settings.localeTitle) $(this).attr("title", parsedTime.toLocaleString()); - refresh.apply(this); - }, - updateFromDOM: function(){ - $(this).data('timeago', { datetime: $t.parse( $t.isTime(this) ? $(this).attr("datetime") : $(this).attr("title") ) }); - refresh.apply(this); - }, - dispose: function () { - if (this._timeagoInterval) { - window.clearInterval(this._timeagoInterval); - this._timeagoInterval = null; - } - } - }; - - $.fn.timeago = function(action, options) { - var fn = action ? functions[action] : functions.init; - if(!fn){ - throw new Error("Unknown function name '"+ action +"' for timeago"); - } - // each over objects here and call the requested function - this.each(function(){ - fn.call(this, options); - }); - return this; - }; - - function refresh() { - //check if it's still visible - if(!$.contains(document.documentElement,this)){ - //stop if it has been removed - $(this).timeago("dispose"); - return this; - } - - var data = prepareData(this); - var $s = $t.settings; - - if (!isNaN(data.datetime)) { - if ( $s.cutoff == 0 || Math.abs(distance(data.datetime)) < $s.cutoff) { - $(this).text(inWords(data.datetime)); - } - } - return this; - } - - function prepareData(element) { - element = $(element); - if (!element.data("timeago")) { - element.data("timeago", { datetime: $t.datetime(element) }); - var text = $.trim(element.text()); - if ($t.settings.localeTitle) { - element.attr("title", element.data('timeago').datetime.toLocaleString()); - } else if (text.length > 0 && !($t.isTime(element) && element.attr("title"))) { - element.attr("title", text); - } - } - return element.data("timeago"); - } - - function inWords(date) { - return $t.inWords(distance(date)); - } - - function distance(date) { - return (new Date().getTime() - date.getTime()); - } - - // fix for IE6 suckage - document.createElement("abbr"); - document.createElement("time"); -})); diff --git a/colab_spb/templates/feed_repository.html b/colab_spb/templates/feed_repository.html deleted file mode 100644 index ab7c00b..0000000 --- a/colab_spb/templates/feed_repository.html +++ /dev/null @@ -1,26 +0,0 @@ -{% load i18n %} - - - - - - -
- - diff --git a/colab_spb/tests/test_get_list.py b/colab_spb/tests/test_get_list.py index 2cd7a30..3c47649 100644 --- a/colab_spb/tests/test_get_list.py +++ b/colab_spb/tests/test_get_list.py @@ -15,9 +15,9 @@ class ColabSPB(TestCase): def test_getlist_without_list(self): response = self.client.get("/spb/get_list/?list_name=") - message = ("Não foi encontrada lista de discussão a está" - " comunidade, para mais detalhes contacte o" - " administrador.") + message = ("Não foi possível encontrada lista de discussão" + " associada a está comunidade, para mais" + " detalhes contacte o administrador.") self.assertEqual(message, response.content) self.assertEqual(404, response.status_code) diff --git a/colab_spb/urls.py b/colab_spb/urls.py index e5ce1c0..f14cdfc 100644 --- a/colab_spb/urls.py +++ b/colab_spb/urls.py @@ -2,6 +2,4 @@ from django.conf.urls import patterns, url from . import views urlpatterns = patterns('', - url(r'^get_list/$', views.get_list, name='get_list'), - url(r'^feed_repository/$', views.feed_repository, - name='feed_repository'), ) + url(r'^get_list/$', views.get_list, name='get_list'),) diff --git a/colab_spb/views.py b/colab_spb/views.py index ce9f1a3..f07fd3c 100644 --- a/colab_spb/views.py +++ b/colab_spb/views.py @@ -41,27 +41,9 @@ def get_list(request): )) if len(context['lists']) == 0: - message = ("Não foi encontrada lista de discussão a está" - " comunidade, para mais detalhes contacte o" - " administrador.") + message = ("Não foi possível encontrada lista de discussão" + " associada a está comunidade, para mais" + " detalhes contacte o administrador.") return HttpResponse(message, status=404) return render(request, "discussion.html", context) - - -def feed_repository(request): - group = request.GET.get('group', "") - project = request.GET.get('project', "") - limit = request.GET.get("limit", 20) - - context = {} - context['url'] = '/gitlab' - - if group: - context['url'] += "/"+group - if project: - context['url'] += "/"+project - if limit: - context['limit'] = limit - - return render(request, "feed_repository.html", context) -- libgit2 0.21.2