Changeset 69

Show
Ignore:
Timestamp:
05/27/08 03:38:14 (6 months ago)
Author:
nobu
Message:

pluggable-contents:

  • とりあえずの適応させてみた。
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/pluggable-contents/blog/templates/blog/_links.html

    r35 r69  
    11{% load i18n %} 
     2<div class="content-box"> 
    23<h2>{{ title }}</h2> 
    34{% spaceless %} 
    …… 
    1617    {% endif %} 
    1718</ul> 
     19</div> 
    1820{% endspaceless %} 

  • branches/pluggable-contents/blog/templates/blog/_tag_cloud.html

    r35 r69  
    11{% load i18n %} 
     2<div class="content-box"> 
    23<h2>{{ title }}</h2> 
    34<ul class="cloud-list" id="{{ id }}"><!-- 
    …… 
    1617    {% endif %} 
    1718--></ul> 
     19</div> 

  • branches/pluggable-contents/blog/templates/blog/base.html

    r17 r69  
    11{% extends "base.html" %} 
    2 {% load blogutils %} 
     2{% load template_plugins %} 
     3 
     4{% block subContent %} 
     5{% do_sub_contents %} 
     6{% endblock %} 
    37 
    48{% block extraContent %} 
    5 {% archive_links %} 
     9{% do_extra_contents %} 
    610{% endblock %} 

  • branches/pluggable-contents/blog/templates/blog/entry_detail.html

    r55 r69  
    173173{% endblock %} 
    174174 
     175{% comment %} 
    175176{% block subContent %} 
    176177{% tag_links obj.tags.all %} 
    177178{% endblock %} 
     179{% endcomment %} 

  • branches/pluggable-contents/blog/templates/blog/entry_list.html

    r58 r69  
    5454{% endblock %} 
    5555 
    56 {% block subContent %} 
     56{% comment %} 
     57{% block subcontent %} 
    5758{% if current_tag %} 
    5859{% tag_links current_tag %} 
    …… 
    6162{% endif %} 
    6263{% endblock %} 
     64{% endcomment %} 

  • branches/pluggable-contents/common/templates/flatpages/default.html

    r40 r69  
    11{% extends "base.html" %} 
    2 {% load i18n blogutils markup %} 
     2{% load i18n blogutils markup template_plugins %} 
    33 
    44{% block title %}{{ obj.title }}{% endblock %} 
    …… 
    1010 
    1111{% block subContent %} 
    12 {% tag_links %} 
     12{% do_sub_contents %} 
    1313{% endblock %} 
    1414 
    1515{% block extraContent %} 
    16 {% archive_links %} 
     16{% do_extra_contents %} 
    1717{% endblock %} 

  • branches/pluggable-contents/media/themes/default/css/layout.css

    r37 r69  
    5555{ 
    5656    float: right; 
    57     margin-bottom: 2em; 
    5857    padding: 0 10px; 
    5958    width: 200px; 
    …… 
    6463    clear: right; 
    6564    float: right; 
    66     margin-bottom: 2em; 
    6765    padding: 0 10px; 
    6866    width: 200px; 
    …… 
    8684{ 
    8785    float: left; 
    88     margin-bottom: 2em; 
    8986    padding: 0 10px; 
    9087    width: 200px; 
    …… 
    9592    clear: left; 
    9693    float: left; 
    97     margin-bottom: 2em; 
    9894    padding: 0 10px; 
    9995    width: 200px; 

  • branches/pluggable-contents/media/themes/default/css/styles.css

    r55 r69  
    414414    } 
    415415 
     416#sub-content div.content-box, 
     417#extra-content div.content-box 
     418{ 
     419    margin: 0; 
     420    margin-bottom: 2em; 
     421} 
     422 
    416423/*  section. 
    417424------------- */ 

  • branches/pluggable-contents/plugins/views.py

    r64 r69  
    266266        t = loader.get_template('blog/_links.html') 
    267267        return t.render(c) 
     268 

  • branches/pluggable-contents/settings.py

    r64 r69  
    117117DESIGN_THEME = 'default' 
    118118 
    119 SUB_CONTENTS = () 
    120 EXTRA_CONTENTS = () 
     119SUB_CONTENTS = ( 
     120    'plugins.views.TagCloudContent', 
     121    'plugins.views.RecentCommentsContent', 
     122) 
     123EXTRA_CONTENTS = ( 
     124    'plugins.views.ArchiveContent', 
     125) 
    121126 
    122127from local_settings import *