From 28b6c6187604f4723603cad6190cbd40f86742dd Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Wed, 11 May 2011 23:42:52 -0400 Subject: [PATCH] Fixed the 12 columns grid widths, minified the css and remove unused fixed width 960 grid --- apps/common/templates/generic_detail.html | 36 +- apps/common/templates/generic_form.html | 34 +- apps/documents/views.py | 15 +- apps/main/templates/base.html | 2 +- apps/permissions/views.py | 7 +- apps/user_management/views.py | 12 +- site_media/css/960-fluid-devel.css | 343 +++ site_media/css/960-fluid.css | 344 +-- .../README.txt | 52 - .../fireworks/960.gs Grid Commands.mxp | Bin 1532 -> 0 bytes .../app_plugins/fireworks/INSTALL.txt | 9 - .../fireworks/_source/12 columns.jsf | 26 - .../fireworks/_source/16 columns.jsf | 26 - .../fireworks/_source/24 columns.jsf | 26 - .../_source/960.gs Grid Commands.mxi | 22 - .../app_plugins/photoshop/960_GRIDS.atn | Bin 34478 -> 0 bytes .../app_plugins/photoshop/INSTALL.txt | 8 - .../code/css/960.css | 1 - .../code/css/960_24_col.css | 1 - .../code/css/reset.css | 1 - .../code/css/rtl_960.css | 1 - .../code/css/rtl_960_24_col.css | 1 - .../code/css/rtl_text.css | 1 - .../code/css/text.css | 1 - .../code/css/uncompressed/960.css | 643 ----- .../code/css/uncompressed/960_24_col.css | 614 ----- .../code/css/uncompressed/demo.css | 47 - .../code/css/uncompressed/reset.css | 53 - .../code/css/uncompressed/rtl_960.css | 631 ----- .../code/css/uncompressed/rtl_960_24_col.css | 602 ----- .../code/css/uncompressed/rtl_text.css | 84 - .../code/css/uncompressed/text.css | 84 - .../code/demo.html | 538 ---- .../code/demo_24_col.html | 411 --- .../code/img/12_col.gif | Bin 96 -> 0 bytes .../code/img/16_col.gif | Bin 101 -> 0 bytes .../code/img/24_col.gif | Bin 105 -> 0 bytes .../code/rtl_demo.html | 538 ---- .../code/rtl_demo_24_col.html | 411 --- .../licenses/GPL_license.txt | 674 ----- .../licenses/MIT_license.txt | 20 - .../sketch_sheets/960_sketch.pdf | Bin 143098 -> 0 bytes .../templates/acorn/960_grid_12_col.acorn | Bin 38912 -> 0 bytes .../templates/acorn/960_grid_16_col.acorn | Bin 43008 -> 0 bytes .../templates/acorn/960_grid_24_col.acorn | Bin 45056 -> 0 bytes .../templates/corel_draw/960_grid_12_col.cdt | Bin 28664 -> 0 bytes .../templates/corel_draw/960_grid_16_col.cdt | Bin 30230 -> 0 bytes .../templates/corel_draw/960_grid_24_col.cdt | Bin 27938 -> 0 bytes .../expression_design/960_grid_12_col.design | Bin 3275 -> 0 bytes .../expression_design/960_grid_16_col.design | Bin 4081 -> 0 bytes .../expression_design/960_grid_24_col.design | Bin 5495 -> 0 bytes .../templates/fireworks/960_grid_12_col.png | Bin 55928 -> 0 bytes .../templates/fireworks/960_grid_16_col.png | Bin 59068 -> 0 bytes .../templates/fireworks/960_grid_24_col.png | Bin 58770 -> 0 bytes .../templates/flash/960_grid_12_col.fla | Bin 41472 -> 0 bytes .../templates/flash/960_grid_16_col.fla | Bin 40448 -> 0 bytes .../templates/flash/960_grid_24_col.fla | Bin 48640 -> 0 bytes .../templates/gimp/960_grid_12_col.xcf | Bin 122883 -> 0 bytes .../templates/gimp/960_grid_16_col.xcf | Bin 131487 -> 0 bytes .../templates/gimp/960_grid_24_col.xcf | Bin 267521 -> 0 bytes .../templates/illustrator/960_grid_12_col.ai | 1689 ------------ .../illustrator/960_grid_12_col_cs5.ait | 2182 ---------------- .../templates/illustrator/960_grid_16_col.ai | 1654 ------------ .../illustrator/960_grid_16_col_cs5.ait | 2271 ----------------- .../templates/illustrator/960_grid_24_col.ai | 1659 ------------ .../illustrator/960_grid_24_col_cs5.ait | 2233 ---------------- .../indesign/cs3/960_grid_12_col.inx | 522 ---- .../indesign/cs3/960_grid_16_col.inx | 562 ---- .../indesign/cs3/960_grid_24_col.inx | 630 ----- .../indesign/cs4/960_grid_12_col.idml | Bin 26568 -> 0 bytes .../indesign/cs4/960_grid_16_col.idml | Bin 26773 -> 0 bytes .../indesign/cs4/960_grid_24_col.idml | Bin 27048 -> 0 bytes .../indesign/cs5/960_grid_12_col.indt | Bin 880640 -> 0 bytes .../indesign/cs5/960_grid_16_col.indt | Bin 888832 -> 0 bytes .../indesign/cs5/960_grid_24_col.indt | Bin 913408 -> 0 bytes .../templates/inkscape/960_grid_12_col.svg | 217 -- .../templates/inkscape/960_grid_16_col.svg | 265 -- .../templates/inkscape/960_grid_24_col.svg | 174 -- .../templates/omnigraffle/960_graffle.graffle | Bin 6309 -> 0 bytes .../templates/photoshop/960_grid_12_col.psd | Bin 391076 -> 0 bytes .../templates/photoshop/960_grid_16_col.psd | Bin 440672 -> 0 bytes .../templates/photoshop/960_grid_24_col.psd | Bin 539546 -> 0 bytes .../templates/visio/960_visio.vsd | Bin 32256 -> 0 bytes 83 files changed, 392 insertions(+), 19985 deletions(-) create mode 100644 site_media/css/960-fluid-devel.css delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/README.txt delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/app_plugins/fireworks/960.gs Grid Commands.mxp delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/app_plugins/fireworks/INSTALL.txt delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/app_plugins/fireworks/_source/12 columns.jsf delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/app_plugins/fireworks/_source/16 columns.jsf delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/app_plugins/fireworks/_source/24 columns.jsf delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/app_plugins/fireworks/_source/960.gs Grid Commands.mxi delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/app_plugins/photoshop/960_GRIDS.atn delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/app_plugins/photoshop/INSTALL.txt delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/code/css/960.css delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/code/css/960_24_col.css delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/code/css/reset.css delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/code/css/rtl_960.css delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/code/css/rtl_960_24_col.css delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/code/css/rtl_text.css delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/code/css/text.css delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/code/css/uncompressed/960.css delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/code/css/uncompressed/960_24_col.css delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/code/css/uncompressed/demo.css delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/code/css/uncompressed/reset.css delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/code/css/uncompressed/rtl_960.css delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/code/css/uncompressed/rtl_960_24_col.css delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/code/css/uncompressed/rtl_text.css delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/code/css/uncompressed/text.css delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/code/demo.html delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/code/demo_24_col.html delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/code/img/12_col.gif delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/code/img/16_col.gif delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/code/img/24_col.gif delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/code/rtl_demo.html delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/code/rtl_demo_24_col.html delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/licenses/GPL_license.txt delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/licenses/MIT_license.txt delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/sketch_sheets/960_sketch.pdf delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/templates/acorn/960_grid_12_col.acorn delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/templates/acorn/960_grid_16_col.acorn delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/templates/acorn/960_grid_24_col.acorn delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/templates/corel_draw/960_grid_12_col.cdt delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/templates/corel_draw/960_grid_16_col.cdt delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/templates/corel_draw/960_grid_24_col.cdt delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/templates/expression_design/960_grid_12_col.design delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/templates/expression_design/960_grid_16_col.design delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/templates/expression_design/960_grid_24_col.design delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/templates/fireworks/960_grid_12_col.png delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/templates/fireworks/960_grid_16_col.png delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/templates/fireworks/960_grid_24_col.png delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/templates/flash/960_grid_12_col.fla delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/templates/flash/960_grid_16_col.fla delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/templates/flash/960_grid_24_col.fla delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/templates/gimp/960_grid_12_col.xcf delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/templates/gimp/960_grid_16_col.xcf delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/templates/gimp/960_grid_24_col.xcf delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/templates/illustrator/960_grid_12_col.ai delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/templates/illustrator/960_grid_12_col_cs5.ait delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/templates/illustrator/960_grid_16_col.ai delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/templates/illustrator/960_grid_16_col_cs5.ait delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/templates/illustrator/960_grid_24_col.ai delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/templates/illustrator/960_grid_24_col_cs5.ait delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/templates/indesign/cs3/960_grid_12_col.inx delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/templates/indesign/cs3/960_grid_16_col.inx delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/templates/indesign/cs3/960_grid_24_col.inx delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/templates/indesign/cs4/960_grid_12_col.idml delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/templates/indesign/cs4/960_grid_16_col.idml delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/templates/indesign/cs4/960_grid_24_col.idml delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/templates/indesign/cs5/960_grid_12_col.indt delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/templates/indesign/cs5/960_grid_16_col.indt delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/templates/indesign/cs5/960_grid_24_col.indt delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/templates/inkscape/960_grid_12_col.svg delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/templates/inkscape/960_grid_16_col.svg delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/templates/inkscape/960_grid_24_col.svg delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/templates/omnigraffle/960_graffle.graffle delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/templates/photoshop/960_grid_12_col.psd delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/templates/photoshop/960_grid_16_col.psd delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/templates/photoshop/960_grid_24_col.psd delete mode 100644 site_media/packages/nathansmith-960-Grid-System-30906f2/templates/visio/960_visio.vsd diff --git a/apps/common/templates/generic_detail.html b/apps/common/templates/generic_detail.html index 6b2f05faf9..1c5ce5b020 100644 --- a/apps/common/templates/generic_detail.html +++ b/apps/common/templates/generic_detail.html @@ -43,8 +43,6 @@ {% endblock %} {% block content %} -
- {% if form %} {% with "true" as read_only %}
@@ -57,25 +55,27 @@ {% endif %} {% endwith %} {% endif %} - - {% for subtemplate in subtemplates_list %} -
- {% if subtemplate.form %} - {% render_subtemplate subtemplate.name subtemplate.context as rendered_subtemplate %} - {% with "true" as read_only %} -
+ +
+ {% for subtemplate in subtemplates_list %} +
+ {% if subtemplate.form %} + {% render_subtemplate subtemplate.name subtemplate.context as rendered_subtemplate %} + {% with "true" as read_only %} +
+ {{ rendered_subtemplate }} +
+ {% endwith %} + {% else %} + {% render_subtemplate subtemplate.name subtemplate.context as rendered_subtemplate %} {{ rendered_subtemplate }} -
- {% endwith %} - {% else %} - {% render_subtemplate subtemplate.name subtemplate.context as rendered_subtemplate %} - {{ rendered_subtemplate }} - {% endif %} + {% endif %}
{% if subtemplate.grid_clear or not subtemplate.grid %} -
+
{% endif %} - {% endfor %} -
+ {% endfor %} +
+ {% endblock %} diff --git a/apps/common/templates/generic_form.html b/apps/common/templates/generic_form.html index 29eb58ce16..f78216e987 100644 --- a/apps/common/templates/generic_form.html +++ b/apps/common/templates/generic_form.html @@ -20,18 +20,15 @@ {% endblock %} {% block content %} -
- {% if form %} -
- {% include "generic_form_subtemplate.html" %} -
- {% if form.grid_clear or not form.grid %} -
- {% endif %} - {% endif %} - - {% for subtemplate in subtemplates_list %} -
+ {% if form %} +
+ {% include "generic_form_subtemplate.html" %} +
+ {% endif %} + +
+ {% for subtemplate in subtemplates_list %} +
{% if subtemplate.form %} {% render_subtemplate subtemplate.name subtemplate.context as rendered_subtemplate %}
@@ -41,11 +38,10 @@ {% render_subtemplate subtemplate.name subtemplate.context as rendered_subtemplate %} {{ rendered_subtemplate }} {% endif %} -
- {% if subtemplate.grid_clear or not subtemplate.grid %} -
- {% endif %} - {% endfor %} - -
+
+ {% if subtemplate.grid_clear or not subtemplate.grid %} +
+ {% endif %} + {% endfor %} +
{% endblock %} diff --git a/apps/documents/views.py b/apps/documents/views.py index 9fc2c31cef..4347707012 100644 --- a/apps/documents/views.py +++ b/apps/documents/views.py @@ -211,9 +211,7 @@ def upload_document_with_type(request, multiple=True): 'context': { 'form': local_form, 'title': _(u'upload a local document'), - 'grid': 6, - 'grid_clear': False if USE_STAGING_DIRECTORY else True, - } + }, } if USE_STAGING_DIRECTORY: @@ -223,15 +221,16 @@ def upload_document_with_type(request, multiple=True): messages.error(request, e) filelist = [] finally: + local_upload_form.update({'grid': 6}) subtemplates_list.append(local_upload_form) subtemplates_list.append( { 'name': 'generic_form_subtemplate.html', + 'grid': 6, + 'grid_clear': True, 'context': { 'form': staging_form, 'title': _(u'upload a document from staging'), - 'grid': 6, - 'grid_clear': True, } }, ) @@ -247,14 +246,10 @@ def upload_document_with_type(request, multiple=True): ) else: subtemplates_list.append(local_upload_form) - context = { 'document_type_id': document_type_id, - 'subtemplates_list': subtemplates_list, - } - context.update({ 'sidebar_subtemplates_list': [ { 'name': 'generic_subtemplate.html', @@ -264,7 +259,7 @@ def upload_document_with_type(request, multiple=True): 'paragraphs': metadata_repr_as_list(decode_metadata_from_url(request.GET)) } }] - }) + } return render_to_response('generic_form.html', context, context_instance=RequestContext(request)) diff --git a/apps/main/templates/base.html b/apps/main/templates/base.html index 16bbd160ba..28c13164ca 100644 --- a/apps/main/templates/base.html +++ b/apps/main/templates/base.html @@ -30,7 +30,7 @@ {##} - {##} +