From: zuber Date: Thu, 24 Sep 2009 20:04:58 +0000 (+0200) Subject: Merge branch 'master' into view-refactor X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/d3c74552a8f8509ff85cf956cf2b750d8387b683?ds=sidebyside;hp=--cc Merge branch 'master' into view-refactor Conflicts: project/templates/explorer/editor.html --- d3c74552a8f8509ff85cf956cf2b750d8387b683 diff --cc project/templates/explorer/editor.html index 5848b0f5,22a60f60..e752286d --- a/project/templates/explorer/editor.html +++ b/project/templates/explorer/editor.html @@@ -12,29 -12,9 +12,33 @@@ - + + + + + + + {# JavaScript templates #} + ++ ++ ++ + - {% endblock extrahead %} {% block extrabody %} @@@ -77,55 -57,63 +81,41 @@@ {% endblock %} {% block maincontent %} -
- {% for n in panel_list %} -
-
-

+

-
- -
-

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

-
-
- {# #} - {#
#} -

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

-
++
++
++
-
-
- - -

Wiadomość nie może być pusta.

- -

- - -

-
- - - - - - {# Wydruk #} - -

-
-
- -
- {% endfor %} --
-
-
- - -
-
- - -

Wiadomość nie może być pusta.

- -

- - -

-
-
++
++
++ ++ ++

Wiadomość nie może być pusta.

++ ++

++ ++ ++

++
++
+ -
-
- - ++
++
++ ++ ++
{% endblock maincontent %}