From: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Date: Mon, 22 Jul 2013 11:34:51 +0000 (+0200)
Subject: Merge branch 'master' into ofop
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/9c90640199aa690235670f01d842e11386ded0ac?hp=-c

Merge branch 'master' into ofop

Conflicts:
	apps/toolbar/fixtures/initial_toolbar.yaml
	redakcja/static/xsl/wl2html_client.xsl
---

9c90640199aa690235670f01d842e11386ded0ac
diff --combined redakcja/settings/compress.py
index 31e86b4e,61437292..b95b883d
--- a/redakcja/settings/compress.py
+++ b/redakcja/settings/compress.py
@@@ -1,5 -1,18 +1,18 @@@
+ STATICFILES_FINDERS = (
+     'django.contrib.staticfiles.finders.FileSystemFinder',
+     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+ #    'django.contrib.staticfiles.finders.DefaultStorageFinder',
+ )
+ 
+ 
+ STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage'
+ PIPELINE_CSS_COMPRESSOR = None
+ PIPELINE_JS_COMPRESSOR = None
+ PIPELINE_STORAGE = 'pipeline.storage.PipelineFinderStorage'
+ 
+ 
  # CSS and JS files to compress
- COMPRESS_CSS = {
+ PIPELINE_CSS = {
      'detail': {
           'source_filenames': (
              'css/master.css',
@@@ -11,30 -24,30 +24,30 @@@
              'css/jquery.autocomplete.css',
              'css/dialogs.css',
          ),
-         'output_filename': 'compressed/detail_styles_?.css',
+         'output_filename': 'compressed/detail_styles.css',
      },
      'catalogue': {
          'source_filenames': (
              'css/filelist.css',
          ),
-         'output_filename': 'compressed/catalogue_styles_?.css',
+         'output_filename': 'compressed/catalogue_styles.css',
       },
       'book': {
          'source_filenames': (
              'css/book.css',
          ),
-         'output_filename': 'compressed/book_?.css',         
+         'output_filename': 'compressed/book.css',
      },
      'book_list': {
          'source_filenames': (
              'contextmenu/jquery.contextMenu.css',
              'css/book_list.css',
          ),
-         'output_filename': 'compressed/book_list_?.css',
+         'output_filename': 'compressed/book_list.css',
      },
  }
  
- COMPRESS_JS = {
+ PIPELINE_JS = {
      # everything except codemirror
      'detail': {
          'source_filenames': (
@@@ -49,7 -62,6 +62,7 @@@
                  # wiki scripts
                  'js/wiki/wikiapi.js',
                  'js/wiki/xslt.js',
 +                'js/wiki/xml-tools.js',
  
                  # base UI
                  'js/wiki/base.js',
@@@ -70,7 -82,7 +83,7 @@@
                  'js/wiki/view_search.js',
                  'js/wiki/view_column_diff.js',
          ),
-         'output_filename': 'compressed/detail_scripts_?.js',
+         'output_filename': 'compressed/detail_scripts.js',
       },
      'catalogue': {
          'source_filenames': (
@@@ -78,7 -90,7 +91,7 @@@
                  'js/slugify.js',
                  'email_mangler/email_mangler.js',
          ),
-         'output_filename': 'compressed/catalogue_scripts_?.js',
+         'output_filename': 'compressed/catalogue_scripts.js',
       },
       'book': {
          'source_filenames': (
@@@ -87,7 -99,7 +100,7 @@@
              'js/book_text/jquery.highlightfade.js',
              'js/book_text/book.js',
          ),
-         'output_filename': 'compressed/book_?.js',
+         'output_filename': 'compressed/book.js',
           },
      'book_list': {
          'source_filenames': (
@@@ -95,13 -107,6 +108,6 @@@
              'contextmenu/jquery.contextMenu.js',
              'js/catalogue/book_list.js',
          ),
-         'output_filename': 'compressed/book_list_?.js',
+         'output_filename': 'compressed/book_list.js',
      }
  }
- 
- COMPRESS = True
- COMPRESS_CSS_FILTERS = None
- COMPRESS_JS_FILTERS = None
- COMPRESS_AUTO = True
- COMPRESS_VERSION = True
- COMPRESS_VERSIONING = 'compress.versioning.hash.MD5Versioning'
diff --combined redakcja/static/xsl/wl2html_client.xsl
index 8be6e225,f5f4e04d..117d24b6
--- a/redakcja/static/xsl/wl2html_client.xsl
+++ b/redakcja/static/xsl/wl2html_client.xsl
@@@ -732,119 -732,6 +732,119 @@@
          </span>
      </xsl:template>
  
 +    <!--
 +        **************************
 +           MATERIAŁY EDUKACYJNE
 +        **************************
 +    -->
 +
 +    <!--
 +        Listy
 +    -->
 +    <xsl:template match="lista">
 +      <xsl:variable name="listtag">
 +	<xsl:choose>
 +	  <xsl:when test="@typ='num' or @typ='alfa'">ol</xsl:when>
 +	  <xsl:when test="@typ='punkt' or @typ='slowniczek' or @typ='czytelnia'">ul</xsl:when>
 +	  <xsl:otherwise>ul</xsl:otherwise>
 +	</xsl:choose>
 +      </xsl:variable>
 +      <xsl:element name="{$listtag}">
 +        <xsl:call-template name="standard-attributes" />
 +        <xsl:apply-templates select="child::node()">
 +          <xsl:with-param name="mixed" select="true()" />
 +        </xsl:apply-templates>	
 +      </xsl:element>
 +    </xsl:template>
 +
 +
 +    <xsl:template match="punkt[../@typ='slowniczek']">
 +      <dl x-node="punkt" class="punkt">
 +            <xsl:call-template name="standard-attributes" />
 +            <xsl:apply-templates select="child::node()">
 +                <xsl:with-param name="mixed" select="true()" />
 +            </xsl:apply-templates>	
 +      </dl>
 +    </xsl:template>
 +
 +    <xsl:template match="punkt[../@typ!='slowniczek']">
 +      <li x-editable="true" x-node="punkt" class="punkt">
 +            <xsl:call-template name="standard-attributes" />
 +            <xsl:apply-templates select="child::node()">
 +                <xsl:with-param name="mixed" select="true()" />
 +            </xsl:apply-templates>	
 +      </li>
 +    </xsl:template>
 +
 +    <!--
 +        Słowniczek
 +    -->
 +    <xsl:template match="definiendum">
 +      <dt x-editable="true" x-node="definiendum" class="definiendum">
 +            <xsl:call-template name="standard-attributes" />
 +            <xsl:apply-templates select="child::node()">
 +                <xsl:with-param name="mixed" select="true()" />
 +            </xsl:apply-templates>
 +      </dt>
 +    </xsl:template>
 +
 +    <xsl:template match="definiens">
 +      <dd x-editable="true" x-node="definiendum" class="definiendum">
 +            <xsl:call-template name="standard-attributes" />
 +            <xsl:apply-templates select="child::node()">
 +                <xsl:with-param name="mixed" select="true()" />
 +            </xsl:apply-templates>
 +      </dd>
 +    </xsl:template>
 +
 +    <!--
 +        Tabela
 +    -->
 +
 +    <xsl:template match="wiersz">
 +      <span>
 +        <xsl:call-template name="standard-attributes" />
 +        <xsl:apply-templates select="child::node()">
 +	  <xsl:with-param name="mixed" select="true()" />
 +        </xsl:apply-templates>
 +      </span>
 +    </xsl:template>
 +
 +
 +    <xsl:template match="kol">
 +      <span>
 +            <xsl:call-template name="standard-attributes" />
 +	    <div x-editable="true" x-node="kol-inside" x-pass-thru="true">
 +              <xsl:apply-templates select="child::node()">
 +		<xsl:with-param name="mixed" select="true()" />
 +              </xsl:apply-templates>
 +	    </div>
 +      </span>
 +    </xsl:template>
 +
 +
 +    <!--
 +        Obraz
 +    -->
 +    <xsl:template match="obraz">
 +      <img x-node="obraz" src="http://i.imgur.com/{@name}.jpg" class="obraz">
 +            <xsl:call-template name="standard-attributes" />
 +      </img>
 +    </xsl:template>
 +
 +    <!--
 +        Semantyczne pudełka
 +    -->
 +    <xsl:template match="pomoce|forma|czas|opis|kol-inside">
 +      <span x-editable="true">
 +            <xsl:call-template name="standard-attributes" />
 +            <xsl:apply-templates select="child::node()">
 +              <xsl:with-param name="mixed" select="true()" />
 +            </xsl:apply-templates>
 +      </span>
 +    </xsl:template>
 +
 +
  
      <!--
          ****************
@@@ -895,8 -782,10 +895,10 @@@
      </xsl:template>
  
      <xsl:template match="*">
-         <span class="unknown-tag" x-node="{name()}">
-             <xsl:call-template name="standard-attributes" />
+         <span>
+             <xsl:call-template name="standard-attributes">
+                 <xsl:with-param name="extra-class">unknown-tag</xsl:with-param>
+             </xsl:call-template>
              <xsl:apply-templates select="child::node()">
                  <xsl:with-param name="mixed" select="true()" />
              </xsl:apply-templates>        
diff --combined requirements.txt
index 4c3aafdd,e741a1b2..107d8c6a
--- a/requirements.txt
+++ b/requirements.txt
@@@ -1,8 -1,10 +1,10 @@@
+ -i http://pypi.nowoczesnapolska.org.pl/simple
+ 
  ## Python libraries
  lxml>=2.2.2
- mercurial>=1.6,<1.7
+ Mercurial>=2.6,<2.7
  PyYAML>=3.0
- PIL>=1.1
+ Pillow
  oauth2
  httplib2 # oauth2 dependency
  
@@@ -10,7 -12,9 +12,9 @@@
  # git+git://github.com/fnp/librarian.git@master#egg=librarian
  
  ## Django
- Django>=1.3,<1.4
+ Django>=1.5,<1.6
+ django-pipeline>=1.2,<1.3
+ django_cas>=2.1,<2.2
  sorl-thumbnail>=11.09,<12
  django-maintenancemode>=0.9
  django-pagination
@@@ -20,6 -24,3 +24,6 @@@ django-komb
  
  # migrations
  south>=0.6
 +
 +# etherpad lite api
 +-e git+git://github.com/devjones/PyEtherpadLite.git#egg=PyEtherpadLite