Changeset 1831

Timestamp:

02/20/09 08:22:34 (18 months ago)

Author:

JensDiemer

Message:

• NEW: markup converter in the page_admin!
• change the MARKUP choice data, see also:  http://www.python-forum.de/topic-17885.html (de)

Location:

trunk/pylucid_project

Files:

• media/PyLucid/internal_page/page_admin/edit_page.css (modified) (3 diffs)
• media/PyLucid/internal_page/page_admin/edit_page.html (modified) (1 diff)
• PyLucid/models/Page.py (modified) (5 diffs)
• PyLucid/models/__init__.py (modified) (1 diff)
• PyLucid/plugins_internal/page_admin/page_admin.py (modified) (12 diffs)
• PyLucid/tools/content_processors.py (modified) (2 diffs)

trunk/pylucid_project/media/PyLucid/internal_page/page_admin/edit_page.css

@@ -34 +34 @@
 #input_fields label {
     float: left;
-    padding-right: 4px;
+    padding: 0.4em;
     text-align: right;
-    width: 9em;
+    width: 11em;
 }
 #input_fields input, #input_fields select {
     width: 35%;
+}
+#input_fields input[type=submit] {
+    width: auto;
 }
 
@@ -50 +53 @@
     width: 75%;
 }
-#input_fields .edit_comment .field_help_text,
-#input_fields .keywords .field_help_text,
-#input_fields .description .field_help_text {
+#input_fields .field_help_text {
     /* setup the help text for keywords and description */
     /* put the help text for bigger input field in the second line */
@@ -58 +59 @@
     padding-left: 14em;
 }
+#input_fields input[type=checkbox] {
+    /* help text after a checkbox should not printed in the next line */
+    float: left;
+}
+
 #input_fields textarea, hr.seperator, #action_buttons {
     /* make the space between the action buttons and the text area smaller */

trunk/pylucid_project/media/PyLucid/internal_page/page_admin/edit_page.html

@@ -65 +65 @@
         {% endfor %}
     </ul>
+    
+    <fieldset>
+    <legend>{% trans 'Change/convert markup' %}</legend>
+    <ul id="input_fields">
+        {% for field in markup_form %}
+            <li title="{{ field.help_text }}" class="{{ field.html_name }}">
+            <label for="{{ field.auto_id }}">{{ field.label }} :</label>
+            {{ field }}
+            <input type="submit" name="submit_{{ field.html_name }}" value="{% trans 'preview' %}" />
+            <br />
+            <span class="field_help_text">{{ field.help_text }}</span>
+            {% if field.errors %}<li class="field_errors">{{ field.errors }}</li>{% endif %}
+        </li>
+        {% endfor %}
+    </ul>
+    </fieldset>
 </form>
 </fieldset>

trunk/pylucid_project/PyLucid/models/Page.py

@@ -8 +8 @@
     Last commit info:
     ~~~~~~~~~~~~~~~~~
-    $LastChangedDate: $
-    $Rev: $
-    $Author: $
+    $LastChangedDate$
+    $Rev$
+    $Author$
 
     :copyleft: 2007-2008 by the PyLucid team, see AUTHORS for more details.
@@ -27 +27 @@
 from PyLucid.tools.shortcuts import getUniqueShortcut
 from PyLucid.system.exceptions import AccessDenied, LowLevelError
-
-
-MARKUPS = (
-    (6, u'Creole wiki markup'),
-    (0, u'html'),
-    (1, u'html + TinyMCE'),
-    (2, u'textile'),
-    (3, u'Textile (original)'),
-    (4, u'Markdown'),
-    (5, u'ReStructuredText'),
-)
 
 
@@ -171 +160 @@
     http://code.djangoproject.com/wiki/Signals
     """
+    
+    # IDs used in other parts of PyLucid, too  
+    MARKUP_CREOLE       = 6
+    MARKUP_HTML         = 0
+    MARKUP_HTML_EDITOR  = 1
+    MARKUP_TINYTEXTILE  = 2
+    MARKUP_TEXTILE      = 3
+    MARKUP_MARKDOWN     = 4
+    MARKUP_REST         = 5
+    
+    MARKUP_CHOICES = (
+        (MARKUP_CREOLE      , u'Creole wiki markup'),
+        (MARKUP_HTML        , u'html'),
+        (MARKUP_HTML_EDITOR , u'html + JS-Editor'),
+        (MARKUP_TINYTEXTILE , u'textile'),
+        (MARKUP_TEXTILE     , u'Textile (original)'),
+        (MARKUP_MARKDOWN    , u'Markdown'),
+        (MARKUP_REST        , u'ReStructuredText'),
+    )
+    MARKUP_DICT = dict(MARKUP_CHOICES)
+    #--------------------------------------------------------------------------
 
     objects = PageManager()
@@ -210 +220 @@
     markup = models.IntegerField(
         db_column="markup_id", # Use the old column name.
-        max_length=1, choices=MARKUPS,
+        max_length=1, choices=MARKUP_CHOICES,
         help_text="the used markup language for this page",
     )
@@ -472 +482 @@
     markup = models.IntegerField(
         db_column="markup_id", # Use the old column name.
-        max_length=1, choices=MARKUPS,
+        max_length=1, choices=Page.MARKUP_CHOICES,
         help_text="the used markup language for this page",
     )

trunk/pylucid_project/PyLucid/models/__init__.py

@@ -17 +17 @@
 """
 
-from Page import Page, PageArchiv, MARKUPS
+from Page import Page, PageArchiv
 from Plugin import Plugin, Preference
 from JS_LoginData import JS_LoginData, User

trunk/pylucid_project/PyLucid/plugins_internal/page_admin/page_admin.py

@@ -29 +29 @@
 
 from django import forms
-from django.forms import ValidationError
 from django.http import HttpResponse, HttpResponseRedirect
-from django.core.cache import cache
 from django.utils.translation import ugettext as _
 from django.utils.safestring import mark_safe
 
+
 from django.conf import settings
-from PyLucid.models import Page, Plugin, MARKUPS
-from PyLucid.db.page import flat_tree_list, get_sitemap_tree
+from PyLucid.models import Page, Plugin
 from PyLucid.db.page_archiv import archive_page
+from PyLucid.system.markups.creole import html2creole
 from PyLucid.system.BasePlugin import PyLucidBasePlugin
-from PyLucid.system.plugin_import import get_plugin_module
+from PyLucid.plugins_internal.page_style.page_style import replace_add_data
 from PyLucid.tools.content_processors import apply_markup, \
                                                         render_string_template
-from PyLucid.plugins_internal.page_style.page_style import replace_add_data
-
-from PyLucid.db.page import PageChoiceField, get_page_choices, flat_tree_list
+from PyLucid.db.page import PageChoiceField, get_page_choices, \
+                                            flat_tree_list, get_sitemap_tree
 
 
@@ -52 +50 @@
 # Keys must be correspond with PyLucid.models.MARKUPS
 HELP_INFO = {
-    2: u'markup_help_tinyTextile',
-    6: u'markup_help_creole',
+    Page.MARKUP_TINYTEXTILE: u'markup_help_tinyTextile',
+    Page.MARKUP_CREOLE: u'markup_help_creole',
 }
 
@@ -81 +79 @@
         max_length=255, required=False, help_text=_("A long page title"),
     )
-    markup = forms.IntegerField(
-        widget=forms.Select(choices=MARKUPS),
-        help_text=_("the used markup language for this page"),
-    )
-
     keywords = forms.CharField(
         max_length=255, required=False,
@@ -109 +102 @@
 #______________________________________________________________________________
 
+
+
+# Use only supported markups for converting choice field
+CONVERT_MARKUPS = [entry for entry in Page.MARKUP_CHOICES
+    if entry[0] in (
+        Page.MARKUP_CREOLE, Page.MARKUP_HTML, Page.MARKUP_HTML_EDITOR
+    )
+]
+
+class MarkupForm(forms.Form):
+    markup = forms.IntegerField(
+        widget=forms.Select(choices=Page.MARKUP_CHOICES),
+        help_text=_(
+            "the used markup language for this page (without converting!)"
+        ),
+    )
+    dest_markup = forms.IntegerField(
+        widget=forms.Select(choices=CONVERT_MARKUPS),
+        help_text=_("convert the current page data to a new markup"),
+    )
+
+
+
+
+#______________________________________________________________________________
+
 class SelectEditPageForm(forms.Form):
     page_id = forms.IntegerField()
+
+#______________________________________________________________________________
+
+
+def change_formdata(form, new_data):
+    """
+    Update form data, after the form instance was validated.
+    
+    Used in page_admin._convert_markup()
+   
+    form.data is a django.http.QueryDict with POST data
+    we must change it to mutable.
+    
+    FIXME: Ugly way to update data
+    http://www.python-forum.de/topic-17894.html (de)
+    """
+    old_mutable = form.data._mutable  
+    form.data._mutable = True
+    form.data.update(new_data)
+    form.data._mutable = old_mutable
+
 
 #______________________________________________________________________________
@@ -154 +194 @@
         self.context["PAGE"] = page_instance
 
-    def _save_edited_page(self, page_instance, html_form):
+    def _save_edited_page(self, page_instance, page_form, markup_form):
         """
         Save a edited page into the database.
@@ -165 +205 @@
         if page_instance.id == self.current_page.id:
             # A existing page was edited
-            edit_comment = html_form.cleaned_data.pop("edit_comment")
+            edit_comment = page_form.cleaned_data.pop("edit_comment")
             # achive the old page data:
             archive_page(self.current_page, edit_comment)
@@ -171 +211 @@
 
         # Assign parent page
-        parent_page_id = html_form.cleaned_data.pop("parent")
+        parent_page_id = page_form.cleaned_data.pop("parent")
         if parent_page_id != None:
             parent = Page.objects.get(id=parent_page_id)
@@ -179 +219 @@
 
         # Transfer the form values into the page instance
-        for key, value in html_form.cleaned_data.iteritems():
+        for key, value in page_form.cleaned_data.iteritems():
             setattr(page_instance, key, value)
+        page_instance.markup = markup_form.cleaned_data["markup"]
 
         try:
@@ -198 +239 @@
             # refresh the current page data:
             self._refresh_curent_page(page_instance)
-
+            
+
+    def _convert_markup(self, content, page_form, markup_form):
+        """
+        Convert the page markup in a POST preview.
+        After a succsessfull convert, we update the form instance data.
+        """
+        dest_markup = markup_form.cleaned_data["dest_markup"]
+        markup_name = Page.MARKUP_DICT[dest_markup]
+        
+        if dest_markup == Page.MARKUP_CREOLE:
+            try:
+                new_content = html2creole(
+                    html_string=content, debug=self.request.debug
+                )
+            except Exception, err:
+                self.page_msg.red(
+                    "Error converting markup to '%s': %s" % (markup_name, err)
+                )
+                return
+        else:
+            # Only 'html' left as the new "markup"
+            new_content = content
+        
+        # Update form instance data for display the converted new content
+        change_formdata(page_form, {"content": new_content})
+        
+        # update the old page markup to the new destination markup
+        change_formdata(markup_form, {"markup": dest_markup})
+        
+        self.page_msg.green(
+            "Markup successfull converted to '%s'" % markup_name
+        )
+
+    def _preview(self, context, page_form, markup_form):
+        # Apply the markup witch is selected in the form
+        content = apply_markup(
+            page_form.cleaned_data["content"],
+            self.context,
+            markup_form.cleaned_data["markup"]
+        )
+        
+        if "submit_dest_markup" in self.request.POST:
+            # We should convert the markup
+            self._convert_markup(content, page_form, markup_form)                    
+
+        preview_escape = page_form.cleaned_data["preview_escape"]
+        if preview_escape == True:
+            # escape django template tags for preview
+            content = escape_django_tags(content)
+
+        content = render_string_template(content, self.context)
+        context["preview_content"] = content
 
     def edit_page(self, edit_page_id=None, new_page_instance=None):
@@ -233 +326 @@
         if self.request.method != 'POST':
             parent = getattr(page_instance.parent, "id", 0) # Root is None
-
-            html_form = EditPageForm({
+            
+            markup_form = MarkupForm({
+                "markup": current_markup,
+                "dest_markup": Page.MARKUP_CREOLE,
+            })
+
+            page_form = EditPageForm({
                 "content": page_instance.content,
                 "parent": parent,
                 "name": page_instance.name,
                 "title": page_instance.title,
-                "markup": current_markup,
                 "keywords": page_instance.keywords,
                 "description": page_instance.description,
@@ -245 +342 @@
             })
         else: # POST
+            #self.page_msg(self.request.POST)
             #self.page_msg(dict(self.request.POST))
-            html_form = EditPageForm(self.request.POST)
-            if html_form.is_valid():
-                if "preview" in self.request.POST:
-                    cleaned_data = html_form.cleaned_data
-                    content = apply_markup(
-                        cleaned_data["content"], self.context,
-                        cleaned_data["markup"]
-                    )
-
-                    preview_escape = cleaned_data["preview_escape"]
-                    if preview_escape == True:
-                        # escape django template tags for preview
-                        content = escape_django_tags(content)
-
-                    content = render_string_template(content, self.context)
-                    context["preview_content"] = content
-
-                    # Use the current selected markup
-                    current_markup = html_form.cleaned_data["markup"]
+            
+            markup_form = MarkupForm(self.request.POST)
+            page_form = EditPageForm(self.request.POST)
+            
+            if page_form.is_valid() and markup_form.is_valid():
+                if "preview" in self.request.POST or \
+                                "submit_markup" in self.request.POST or \
+                                "submit_dest_markup" in self.request.POST:
+                    self._preview(context, page_form, markup_form)
+                    
+                    # For later use
+                    current_markup = markup_form.cleaned_data["markup"]
 
                 elif "save" in self.request.POST:
                     # Save the new page data. returns a new page instance
-                    return self._save_edited_page(page_instance, html_form)
+                    return self._save_edited_page(
+                        page_instance, page_form, markup_form
+                    )
                 else:
                     self.page_msg.red("Form error!")
 
-        context["edit_page_form"] = html_form
+
+        context["markup_form"] = markup_form
+        context["edit_page_form"] = page_form
 
         # Edit in the django admin panel:#
@@ -291 +386 @@
             context["help_link"] = self.URLs.methodLink(
                 "markup_help", current_markup
+        
             )
             # TODO: make help link working

trunk/pylucid_project/PyLucid/tools/content_processors.py

@@ -149 +149 @@
     return HtmlEmitter(document, macros=PyLucid_creole_macros, verbose=1).emit()
 
+from PyLucid.models import Page
+
+
 
 def apply_markup(content, context, markup_no):
@@ -159 +162 @@
     page_msg = request.page_msg
 
-    if markup_no == 2: # textile
+    if markup_no == Page.MARKUP_TINYTEXTILE: # PyLucid's TinyTextile
         content = apply_tinytextile(content, context)
-    elif markup_no == 3: # Textile (original)
+        
+    elif markup_no == Page.MARKUP_TEXTILE: # Textile (original)
         content = apply_textile(content, page_msg)
-    elif markup_no == 4: # Markdown
+        
+    elif markup_no == Page.MARKUP_MARKDOWN:
         content = apply_markdown(content, page_msg)
-    elif markup_no == 5: # ReStructuredText
+        
+    elif markup_no == Page.MARKUP_REST:
         content = apply_restructuretext(content, page_msg)
-    elif markup_no == 6: # Creole wiki markup
+        
+    elif markup_no == Page.MARKUP_CREOLE:
         content = apply_creole(content)