Changeset 2541

Timestamp:

02/24/10 21:31:33 (5 months ago)

Author:

JensDiemer

Message:

• new: markup help pages
• new: page list

Location:

branches/0.9/pylucid_project

Files:

• apps/pylucid/models/pagecontent.py (modified) (3 diffs)
• media/PyLucid/markup_help (added)
• media/PyLucid/markup_help/creole_cheat_sheet.png (added)
• pylucid_plugins/page_admin/admin_urls.py (modified) (2 diffs)
• pylucid_plugins/page_admin/admin_views/edit_page.py (modified) (2 diffs)
• pylucid_plugins/page_admin/admin_views/markup_help.py (added)
• pylucid_plugins/page_admin/admin_views/page_list.py (added)
• pylucid_plugins/page_admin/forms.py (modified) (2 diffs)
• pylucid_plugins/page_admin/templates/page_admin/edit_inline_form.html (modified) (10 diffs)
• pylucid_plugins/page_admin/templates/page_admin/includes/edit_content_page_buttons.html (modified) (2 diffs)
• pylucid_plugins/page_admin/templates/page_admin/markup_help_base.html (added)
• pylucid_plugins/page_admin/templates/page_admin/markup_help_creole.html (added)
• pylucid_plugins/page_admin/templates/page_admin/markup_help_markdown.html (added)
• pylucid_plugins/page_admin/templates/page_admin/markup_help_rest.html (added)
• pylucid_plugins/page_admin/templates/page_admin/markup_help_textile.html (added)
• pylucid_plugins/page_admin/templates/page_admin/markup_help_tinytextile.html (added)
• pylucid_plugins/page_admin/templates/page_admin/page_list_popup.html (added)
• pylucid_plugins/page_admin/templates/page_admin/tag_list_popup.html (modified) (2 diffs)
• pylucid_plugins/page_admin/views.py (modified) (1 diff)

branches/0.9/pylucid_project/apps/pylucid/models/pagecontent.py

@@ -4 +4 @@
     PyLucid models
     ~~~~~~~~~~~~~~
-    
+
     Last commit info:
     ~~~~~~~~~~~~~~~~~
@@ -43 +43 @@
     """
     A normal CMS Page with text content.
-    
+
     signals connection is in pylucid_project.apps.pylucid.models.__init__
 
@@ -61 +61 @@
     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_DATA = (
+        # [0] = markup ID (e.g. database integer field)
+        # [1] = lowcase, ASCII-only, no spaces (e.g. for filename)
+        # [2] = verbose name (used e.g. in select input form)
+        (MARKUP_CREOLE, u"creole", u'Creole wiki markup'),
+        (MARKUP_HTML, u"html", u'html'),
+        (MARKUP_HTML_EDITOR, u"htmleditor", u'html + JS-Editor'),
+        (MARKUP_TINYTEXTILE, u"tinytextile", u'tinytextile'),
+        (MARKUP_TEXTILE, u"textile", u'Textile (original)'),
+        (MARKUP_MARKDOWN, u"markdown", u'Markdown'),
+        (MARKUP_REST, u"rest", u'ReStructuredText'),
     )
+    # For djanfo choice form field:
+    MARKUP_CHOICES = [(data[0], data[2]) for data in MARKUP_DATA]
+
+    # For easy "get name by id":
     MARKUP_DICT = dict(MARKUP_CHOICES)
+
+    # for mapping the ID with short name
+    MARKUP_SHORT_DICT = dict([(data[0], data[1]) for data in MARKUP_DATA])
+
     #--------------------------------------------------------------------------
 

branches/0.9/pylucid_project/pylucid_plugins/page_admin/admin_urls.py

@@ -24 +24 @@
 from admin_views.page_order import page_order
 from admin_views.tag_list import tag_list
+from admin_views.page_list import page_list
+from admin_views.markup_help import markup_help
 from admin_views.translate_page import translate_page
 
@@ -35 +37 @@
     url(r'^translate/(?P<pagemeta_id>\d+?)/$', translate_page, name='PageAdmin-translate'),
     url(r'^tag_list/$', tag_list, name='PageAdmin-tag_list'),
+    url(r'^page_list/$', page_list, name='PageAdmin-page_list'),
+    url(r'^markup_help/$', markup_help, name='PageAdmin-markup_help'),
     url(r'^bulk_editor/$', bulk_editor, name='PageAdmin-bulk_editor'),
 )

branches/0.9/pylucid_project/pylucid_plugins/page_admin/admin_views/edit_page.py

@@ -64 +64 @@
         "template_name": "page_admin/edit_content_page.html",
         "abort_url": pagecontent.get_absolute_url(),
+        "pagecontent": pagecontent,
+
+        "markup_id_str": str(pagecontent.markup),
 
         "all_forms": all_forms, # For display the form error list from all existing forms.
@@ -70 +73 @@
         "pagemeta_form":pagemeta_form,
         "pagecontent_form": pagecontent_form,
-
-        "pagelinklist_url": "#TODO",
     })
     return context

branches/0.9/pylucid_project/pylucid_plugins/page_admin/forms.py

@@ -110 +110 @@
         exclude = ("pagemeta",)
 
+def _markup_choices(*id_filter):
+    choices = [entry for entry in PageContent.MARKUP_CHOICES if entry[0] in id_filter]
+    return choices
+
 
 class ConvertMarkupForm(forms.ModelForm):
     # Use only supported markups for converting choice field
-    MARKUP_CHOICES = [entry for entry in PageContent.MARKUP_CHOICES
-        if entry[0] in (
-            PageContent.MARKUP_CREOLE, PageContent.MARKUP_HTML, PageContent.MARKUP_HTML_EDITOR
-        )
-    ]
-    dest_markup = forms.IntegerField(
-        widget=forms.Select(choices=MARKUP_CHOICES),
+    MARKUP_CHOICES = _markup_choices(
+        PageContent.MARKUP_CREOLE, PageContent.MARKUP_HTML, PageContent.MARKUP_HTML_EDITOR
+    )
+    dest_markup = forms.ChoiceField(
+        choices=MARKUP_CHOICES,
         help_text=_("convert the current page content to this new markup"),
     )
@@ -125 +127 @@
         help_text=_("Display original html and a html diff."),
     )
+    def clean_markup(self):
+        return int(self.cleaned_data['markup'])
     class Meta:
         model = PageContent
         fields = ('content',)
+
+
+class SelectMarkupForm(forms.Form):
+    """ for page list admin view """
+    markup = forms.ChoiceField(
+        choices=PageContent.MARKUP_CHOICES,
+        help_text=_("switch to other markup format"),
+    )
+
+
+class SelectMarkupHelpForm(forms.Form):
+    """
+    For markup help admin view
+    There ist no help page for html code
+    """
+    MARKUP_CHOICES = _markup_choices(
+            PageContent.MARKUP_CREOLE,
+            PageContent.MARKUP_TINYTEXTILE,
+            PageContent.MARKUP_TEXTILE,
+            PageContent.MARKUP_MARKDOWN,
+            PageContent.MARKUP_REST,
+    )
+    markup = forms.ChoiceField(
+        choices=MARKUP_CHOICES,
+        help_text=_("switch to other markup help"),
+    )
+    def clean_markup(self):
+        return int(self.cleaned_data['markup'])
+
+
+#    class Meta:
+#        model = PageContent
+#        fields = ('markup',)
 
 

branches/0.9/pylucid_project/pylucid_plugins/page_admin/templates/page_admin/edit_inline_form.html

@@ -24 +24 @@
 jQuery(document).ready(function($) {
     log("edit_inline_form.html ready.");
-     
+
     $("#ajax_preview").show(); // unhide ajax preview button
-   
+
     $("#edit_page_form").change(function() {
         log("edit page form change");
@@ -41 +41 @@
         $("#edit_page_form").before('<h2 class="ajax_msg">{% trans "submit" %}...</h2>');
     });
-    
+
     // $(window).bind('beforeunload', function() {
     // ^ this doesn't work!
@@ -47 +47 @@
         log("beforeunload evend called. textarea_changed:" + textarea_changed);
         if (textarea_changed == true) {
-            return "{% trans "Textarea has been changed! Changes are not saved if you leave." %}"; 
+            return "{% trans "Textarea has been changed! Changes are not saved if you leave." %}";
         }
     }
-   
+
     // from media/PyLucid/pylucid_js_tools.js
     // pylucid_ajax_form_view('#edit_page_form');
     replace_openinwindow_links();
-    
+
     var preview_div = $("#edit_page_preview");
-    
+
     $("#ajax_preview").click(function() {
         log("ajax preview clicked");
@@ -62 +62 @@
         $("#edit_page_preview").html('<h2 class="ajax_msg">{% trans "loading" %}...</h2>');
         $("#preview_fieldset").slideDown();
-    
+
         var content = $("#id_content")[0].value;
-    
+
         var url = encodeURI("{{ preview_url }}");
         log("post:" + url);
         log("content:" + content);
-        
+
         $.post(url, { "content": content, "preview": true }, function(form_html){
             preview_div.html(form_html);
@@ -74 +74 @@
     });
     $("#submit_preview").hide();
-    
+
     $("#abort_button").click(function() {
         {% comment %}
@@ -82 +82 @@
         self.location.href='{{ abort_url }}';
     });
-    
+
     activate_resize_textarea_buttons();
 });
@@ -97 +97 @@
     {% trans 'Edit the CMS page' %} '<strong>{{ pagemeta.get_title|escape }}</strong>'
 </legend>
-<form action="{{ form_url }}" method="post" id="edit_page_form">   
+<form action="{{ form_url }}" method="post" id="edit_page_form">
  <div class="helper_buttons">
      <input type="submit" name="save" value="{% trans 'save' %}" />
@@ -105 +105 @@
      </button>
      <input type="button" id="abort_button" name="abort" value="{% trans 'abort' %}" />
-     <a href="{{ pagelinklist_url }}" class="openinwindow" title="{% trans 'List of all pages for creating links' %}">
+     <a href="{% url PageAdmin-page_list %}?markup={{ pagecontent.markup }}" class="openinwindow" title="{% trans 'List of all pages for creating links' %}">
          <button type="button" class="button">{% trans 'page list' %}</button>
      </a>
@@ -111 +111 @@
          <button type="button" class="button">{% trans 'tag list' %}</button>
      </a>
+
+     {% if markup_id_str in "26" %}
+     <a href="{% url PageAdmin-markup_help %}?markup={{ pagecontent.markup }}" class="openinwindow" title="{% trans 'Markup help' %}">
+         <button type="button" class="button">{% trans 'markup help' %}</button>
+     </a>
+     {% endif %}
+
      <button type="button" class="button resize_textarea" id="bigger_id_content" title="{% trans 'makes the textarea bigger' %}">
          +
@@ -117 +124 @@
          -
      </button>
- </div>   
+ </div>
 {% with edit_page_form as form %}
     {% include "admin/pylucid/includes/pylucid_formset.html" %}

branches/0.9/pylucid_project/pylucid_plugins/page_admin/templates/page_admin/includes/edit_content_page_buttons.html

@@ -8 +8 @@
     {% endif %}
     <input type="submit" id="preview" name="preview" value="{% trans 'markup preview' %}" />
-    <a href="{{ pagelinklist_url }}" class="openinwindow" title="{% trans 'List of all pages for creating links' %}">
+    <a href="{% url PageAdmin-page_list %}?markup={{ pagecontent.markup }}" class="openinwindow" title="{% trans 'List of all pages for creating links' %}">
         <button type="button" class="button">{% trans 'page list' %}</button>
     </a>
@@ -14 +14 @@
         <button type="button" class="button">{% trans 'tag list' %}</button>
     </a>
+
+     {% if markup_id_str in "26" %}
+     <a href="{% url PageAdmin-markup_help %}?markup={{ pagecontent.markup }}" class="openinwindow" title="{% trans 'Markup help' %}">
+         <button type="button" class="button">{% trans 'markup help' %}</button>
+     </a>
+     {% endif %}
+
     <button type="button" class="button resize_textarea" id="bigger_id_content" title="{% trans 'makes the textarea bigger' %}">
         +

branches/0.9/pylucid_project/pylucid_plugins/page_admin/templates/page_admin/tag_list_popup.html

@@ -1 +1 @@
 {% extends "admin/base_site.html" %}
+
+{% block extrahead %}
+<style type="text/css">
+.example_link {
+    padding: 0px;
+    margin: 0px;
+    min-width: 400px;
+    width: 100%;
+    border: 0px!important;
+}
+tr {
+    background-color: #ffffff;
+}
+tr:hover {
+    background-color: #e0e0e0;
+}
+
+</style>
+<script type="text/javascript">
+jQuery(document).ready(function($) {
+        $('.example_tag').each(function() {
+                // 'resize' every input field
+        var len = $(this).val().length;
+        $(this).attr("size", len);
+        $(this).attr("maxlength", len);
+        });
+        $('.example_tag').hover(function() {
+                $(this).select();
+        });
+});
+</script>
+{% endblock extrahead %}
 
 {% block content %}
@@ -14 +46 @@
     <td title="for copy&amp;paste into your cms page" class="nowrap">
         {% if lucid_tag.fallback_example %}
-            <i title="The plugin has no example in source code!">{{ lucid_tag.fallback_example }}</i>
+            <input type="text" class="example_tag" title="automatic generated example" value='{{ lucid_tag.fallback_example }}'></input><br />
         {% else %}
-            {% if lucid_tag.examples %}
-                {{ lucid_tag.examples|join:"<br />" }}
-            {% endif %}
+            {% for example in lucid_tag.examples %}
+                <input type="text" class="example_tag" value='{{ example }}'></input><br />
+            {% endfor %}
         {% endif %}
     </td>

branches/0.9/pylucid_project/pylucid_plugins/page_admin/views.py

@@ -70 +70 @@
         "preview_html": preview_html,
 
-        "pagelinklist_url": "#TODO", #FIXME ;)
-        "taglist_url": "#TODO", #FIXME ;)
+        "markup_id_str": str(pagecontent.markup),
 
         "edit_page_form": edit_page_form,