Conjunto de mudanças 6208 no repositório publico


Ignorar:
Timestamp:
16/04/2012 15:38:47 (9 anos atrás)
Autor:
seocam
Mensagem:

Merge com https://bitbucket.org/seocam/atu-colab/src/810a0e848fcd

Localização:
colab/trunk
Arquivos:
2 adicionados
11 editados

Legenda:

Não Modificado
Adicionado
Removido
  • colab/trunk/colab/rss/feeds.py

    r6126 r6208  
    2020
    2121    def item_title(self, item):
    22         return item.latest_message.subject_clean   
     22        title = '[' + item.mailinglist.name + '] '
     23        title += item.latest_message.subject_clean 
     24        return title
    2325
    2426    def item_description(self, item):
     
    3739
    3840    def item_title(self, item):
    39         return item.latest_message.subject_clean   
     41        title = '[' + item.mailinglist.name + '] '
     42        title += item.latest_message.subject_clean 
     43        return title 
    4044
    4145    def item_description(self, item):
  • colab/trunk/colab/rss/urls.py

    r6126 r6208  
    33
    44urlpatterns = patterns('',
    5     url(r'threads/latest/$', feeds.LatestThreadsFeeds()),
    6     url(r'colab/latest/$', feeds.LatestColabFeeds()),
    7     url(r'threads/hottest/$', feeds.HottestThreadsFeeds()),
     5    url(r'threads/latest/$', feeds.LatestThreadsFeeds(), name='rss_latest_threads'),
     6    url(r'colab/latest/$', feeds.LatestColabFeeds(), name='rss_latest_colab'),
     7    url(r'threads/hottest/$', feeds.HottestThreadsFeeds(), name='rss_hottest_threads'),
    88)
    99
  • colab/trunk/colab/settings.py

    r6126 r6208  
    156156SOLR_COLAB_URI = 'http://colab.interlegis.gov.br'
    157157SOLR_BASE_QUERY = """
    158     (Type:changeset OR Type:ticket OR Type:wiki OR Type:thread)
     158    ((Type:changeset OR Type:ticket OR Type:wiki OR Type:thread) AND Title:["" TO *])
    159159"""
    160160
  • colab/trunk/colab/static/css/screen.css

    r6017 r6208  
    223223}
    224224
    225 
     225.rss {
     226    float: right;
     227    padding-top: 2px;
     228}
     229
  • colab/trunk/colab/static/img/COPYRIGHT

    r6017 r6208  
    77* x.png
    88* plus.png
     9* rss.png
    910
    1011The full Iconic package can be found here: https://github.com/downloads/somerandomdude/Iconic/iconic.zip
  • colab/trunk/colab/super_archives/views.py

    r6126 r6208  
    5757   
    5858    paginator = Paginator(threads, 16)
    59     page = int(request.GET.get('p', '1'))
     59    try:
     60        page = int(request.GET.get('p', '1'))
     61    except ValueError:
     62        page = 1
    6063    threads = paginator.page(page)
    6164   
  • colab/trunk/colab/templates/base.html

    r6017 r6208  
    4545
    4646    {% endblock %}
     47
     48    {% block google_analytics %}
     49    <script type="text/javascript">
     50
     51      var _gaq = _gaq || [];
     52      _gaq.push(['_setAccount', 'UA-30841845-2']);
     53      _gaq.push(['_trackPageview']);
     54   
     55      (function() {
     56        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
     57        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
     58        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
     59      })();
     60
     61    </script>
     62    {% endblock %}
     63
    4764  </head>
    4865
  • colab/trunk/colab/templates/home.html

    r6126 r6208  
    1919
    2020  <div class="span-12 colborder">
    21     <h3>{% trans "Últimas Colaborações" %}</h3>
     21    <h3>{% trans "Últimas Colaborações" %}<a class="rss" target="_blank"
     22        href="{% url rss_latest_colab %}"
     23        title="{% trans "RSS - Últimas Colaborações" %}">
     24        <img src="{{ STATIC_URL }}img/rss.png" alt="RSS"/></a>
     25    </h3>
    2226    <ul>
    2327      {% for doc in latest_docs %}
     
    4044
    4145  <div class="span-12 colborder">
    42     <h3>{% trans "Discussões Mais Relevantes" %}</h3>
     46    <h3>{% trans "Discussões Mais Relevantes" %}<a class="rss" target="_blank"
     47        href="{% url rss_hottest_threads %}"
     48        title="{% trans "RSS - Discussões Mais Relevantes" %}">
     49        <img src="{{ STATIC_URL }}img/rss.png" alt="RSS"/></a>
     50    </h3>
    4351    <ul>
    4452      {% for thread in hottest_threads %}
     
    5361
    5462  <div class="span-11 last">
    55     <h3>{% trans "Últimas Discussões" %}</h3>
     63    <h3>{% trans "Últimas Discussões" %}<a class="rss" target="_blank"
     64        href="{% url rss_latest_threads %}"
     65        title="{% trans "RSS - Últimas Discussões" %}">
     66        <img src="{{ STATIC_URL }}img/rss.png" alt="RSS"/></a>
     67    </h3>
    5668    <ul>
    5769      {% for thread in latest_threads %}
  • colab/trunk/colab/urls.py

    r6126 r6208  
    2323        'colab.views.userprofile.by_emailhash'),
    2424   
    25     url(r'^user/(?P<username>[\w]+)/edit/?$',
     25    url(r'^user/(?P<username>[\w@+.-]+)/edit/?$',
    2626        'colab.views.userprofile.update', name='user_profile_update'),
    2727       
  • colab/trunk/colab/views/other.py

    r6126 r6208  
    88
    99from django.template import RequestContext
     10from django.http import HttpResponseNotAllowed
    1011from django.shortcuts import render_to_response
    1112from django.utils.translation import ugettext as _
     
    3233
    3334def search(request):
    34     if request.method == 'GET':
    35         query = request.GET.get('q')
    36         sort = request.GET.get('o')
    37         type_ = request.GET.get('type')
    38         page_number = int(request.GET.get('p', 1))
     35    if request.method != 'GET':
     36        return HttpResponseNotAllowed(['GET'])
     37   
     38    query = request.GET.get('q')
     39    sort = request.GET.get('o')
     40    type_ = request.GET.get('type')
     41    try:
     42        page_number = int(request.GET.get('p', '1'))
     43    except ValueError:
     44        page_number = 1
     45   
     46    try:
    3947        results_per_page = int(request.GET.get('per_page', 16))
     48    except ValueError:
     49        results_per_page = 16
    4050
    4151    filters = {
  • colab/trunk/solr-conf/schema.xml

    r6017 r6208  
    466466          stored="true" required="true" multiValued="false"/>
    467467   <field name="Title" type="text_ptbr" indexed="true"
    468           stored="true" required="false" multiValued="false"/>
     468          stored="true" required="true" multiValued="false"/>
    469469   <field name="Description" type="text_ptbr" indexed="true"
    470470          stored="true" required="false" multiValued="false"/>
Note: Veja TracChangeset para ajuda no uso do visualizador de conjunto de mudanças.
 

The contents and data of this website are published under license:
Creative Commons 4.0 Brasil - Atribuir Fonte - Compartilhar Igual.