From 8f604e87ab42ec2b5c2116fcb1dde001d8fc1d59 Mon Sep 17 00:00:00 2001 From: Rui Manuel da Silva Martins Date: Wed, 12 Aug 2015 15:20:54 +0100 Subject: [PATCH] Release v0.2.2: Added duplicate content buttons to translated StreamFieldPanels; --- AUTHORS.rst | 1 + CHANGELOG.txt | 3 +++ PKG-INFO | 5 ++--- setup.py | 4 ++-- wagtail_modeltranslation/models.pyc | Bin 8015 -> 12257 bytes .../css/page_editor_modeltranslation.css | 12 ++++++++++++ .../modeltranslation/js/copy_stream_fields.js | 4 +++- wagtail_modeltranslation/wagtail_hooks.py | 9 ++++++++- 8 files changed, 31 insertions(+), 7 deletions(-) create mode 100644 wagtail_modeltranslation/static/modeltranslation/css/page_editor_modeltranslation.css diff --git a/AUTHORS.rst b/AUTHORS.rst index 996bdb7..2a8e54c 100755 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -8,6 +8,7 @@ Core Committers * Diogo Marques * Rui Martins +* Eduardo Nogueira Contributors ------------ diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 34098f1..c7b2ab9 100755 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,6 @@ +v0.2.2: +- Added duplicate content buttons to translated StreamFieldPanels; + v0.2.1: - Fixed missing templatetags folder on pypi package; diff --git a/PKG-INFO b/PKG-INFO index 14ef76d..6381dc5 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,10 +1,9 @@ Metadata-Version: 1.0 Name: wagtail-modeltranslation -Version: 0.2.1 +Version: 0.2.2 Summary: Translates Wagtail CMS models using a registration approach. Home-page: https://github.com/infoportugal/wagtail-modeltranslation -Author: Diogo Marques, - Rui Martins, +Author: Diogo Marques, Eduardo Nogueira, Rui Martins Author-email: ... License: New BSD Description: The modeltranslation application can be used to translate dynamic diff --git a/setup.py b/setup.py index a208502..7516f44 100755 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from distutils.core import setup setup( name='wagtail-modeltranslation', - version='0.2.1', + version='0.2.2', description='Translates Wagtail CMS models using a registration approach.', long_description=( 'The modeltranslation application can be used to translate dynamic ' @@ -23,7 +23,7 @@ setup( package_data={'wagtail_modeltranslation': ['static/modeltranslation/css/*.css', 'static/modeltranslation/js/*.js']}, requires=['django(>=1.7)', 'wagtail(>=1.0)'], - download_url='https://github.com/infoportugal/wagtail-modeltranslation/archive/v0.2.1.tar.gz', + download_url='https://github.com/infoportugal/wagtail-modeltranslation/archive/v0.2.2.tar.gz', classifiers=[ 'Programming Language :: Python', 'Programming Language :: Python :: 2.6', diff --git a/wagtail_modeltranslation/models.pyc b/wagtail_modeltranslation/models.pyc index 4c8e1a386e09f766b42f87c3bcae264631342b3e..2210689b1ecee943ebd87ada1e3237674f3a6b5f 100644 GIT binary patch literal 12257 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 HHQ4t*-eolE delta 2799 zcmbVNO>7%Q6n-;nuYcEG|0Yh-kfcfLr1_z=>R;L_Ra2D`NYSKKVAa-g<4tR4*G}w> zXoXFMQUns>!c^jjDlSM+i7E&R2L!4(0|z8-hyy|bBn~}rK`QT!W3}8ulbz4+y?Jl; zn|W{E{!;kv_zmrW5kB_eYv-3>>rcbq861tT5K8zkZ~&~f%)w#ca22K)P5|5>Si!cggA)Qb3|1K22v`v)xKXg8?a2T*2DmY>V&KNXinpyn za7=I$U?tjm2%IFiDX>!Drol?1H4JtJmKl^Ha1&qy;AJaIychCOIn6$k6Feg?@DXVk zyKmgVUD>!F^hO$*LLb}(7okAh{+1=$vG_U` zqhs-REHSd|r!c)^iYuo;=S?P*f{H-`N+BgAK`i7W@}ZI8Z!wvTof$wzEe)C)R6@`M zsQ8JI$Dj}5uJw~JdocyAFf;>DF`yZyV7B%JEUw)G zd=|af)}l>6`D|!7`zkE9U*yGMMTdHrq0qJ*s{(kzM?AKeU3`pMD+1S^gJuLOCR7rX zoY{+q;Q|tiLJKKG6>S|VNwxSiqg|xPj@0U?rlDy-Ap>jE44*|WD-&jBs0-8R`Ke6T zSM9opk{U!P6w1}IS15?EeAYb2ML>RTx^gtpD{G0dL&~LYudSEscFFUh|GE0QosUs8 zX${+1Rzk6UrQzvlS$Ty-c{lMkv*iziW8I}nv3jL8;g+jcYvt-x=eH<--qR-^>fsxL zR_mq3ofEs$7*u6viYF=QbpcH*a1I`aiYBY6VPivCv@Of~X!%rG zd|Q_9Q(x|y#22aUFV$ABtFtQE_9`i23a7-=1bgMj>B(&#Mn+^X8=)C z8`B+?UuWmic{(#SQLZ+;Vs*(Dc{$y+cbjx~iY&%o!qMnPK)O6hIm6uOIFig{Q5oz0 zr)LLFiZnrvfc7T(37(R}x$zz)j*~utkjK%6#`a1`7kwDfkiX}~_}?Jcb{vTP3D=t7 z;idQC^;wfv&yM-m0q-bwsT`RDu!31f6E-mp2U|Me&BXSEhgsnr$7K%LRsfnls06{o zlMY}8C}e{%IoIFMAAnrx?@2y@Dtf6jETA(bVXk-42qCF~&gGG}dvo&!T10|?>Rp^5 zz(H#RJbz;T^!XE~Pb~;4VzniY0y_4>$+NSk1l?mnSrch#^z~sy@2i83LGidaB+0!}Yt*nQaS84faL%AF(Qhp0aY zN{)yVsH8_oIz-SuG?el|QfCN`5#;5YBa7w}vN(z>{0N)1U4OBuSz7Hp0ksrCcT^M* z^7J7P0|=^TuNLce)f02_o&0til{_$-;J?A>A-JzDH4o%%2)k#!ONs@C6!J{u4wlJ@}&^Gu0 diff --git a/wagtail_modeltranslation/static/modeltranslation/css/page_editor_modeltranslation.css b/wagtail_modeltranslation/static/modeltranslation/css/page_editor_modeltranslation.css new file mode 100644 index 0000000..181b8cf --- /dev/null +++ b/wagtail_modeltranslation/static/modeltranslation/css/page_editor_modeltranslation.css @@ -0,0 +1,12 @@ +.translation-field-copy-wrapper{ + float: right; + margin-right: 20px; +} +.translation-field-copy-wrapper > button{ + width: 30px; + height: 30px; + line-height: 30px; + text-align: center; + padding: 0; + margin-left: 10px; +} \ No newline at end of file diff --git a/wagtail_modeltranslation/static/modeltranslation/js/copy_stream_fields.js b/wagtail_modeltranslation/static/modeltranslation/js/copy_stream_fields.js index 8a7c0c5..b12bba0 100644 --- a/wagtail_modeltranslation/static/modeltranslation/js/copy_stream_fields.js +++ b/wagtail_modeltranslation/static/modeltranslation/js/copy_stream_fields.js @@ -15,11 +15,13 @@ $(document).ready(function(){ var fieldName = fieldInfos.split('_')[0]; var fieldLang = fieldInfos.split('_')[1]; //The cycle to create the buttons for copy each language field + var copyContentString = 'Copy content from'; + header.innerHTML += '
'+copyContentString+':
'; for (var j = 0; j < langs.length; j++) { if (fieldLang != langs[j]) { var currentFieldID = fieldName + '_' + fieldLang; var targetFieldID = fieldName + '_' + langs [j]; - header.innerHTML += ''; + $(header).children('.translation-field-copy-wrapper')[0].innerHTML += ''; }; }; }; diff --git a/wagtail_modeltranslation/wagtail_hooks.py b/wagtail_modeltranslation/wagtail_hooks.py index 77af94b..6758a35 100644 --- a/wagtail_modeltranslation/wagtail_hooks.py +++ b/wagtail_modeltranslation/wagtail_hooks.py @@ -98,7 +98,7 @@ def streamfields_translation_copy(): and send a ajax request to copy the content. """ - # includes the java script file in the html file + # includes the javascript file in the html file js_files = [ 'modeltranslation/js/copy_stream_fields.js', ] @@ -108,3 +108,10 @@ def streamfields_translation_copy(): ) return js_includes + + +@hooks.register('insert_editor_css') +def modeltranslation_page_editor_css(): + return format_html('')