From b8532fabe4524e04483815d7173f51579c188b70 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Fri, 18 Jan 2013 22:23:31 +0100 Subject: [PATCH] Removed files from images to img dir. --- extras/benchmark/bench.py | 16 +--------------- openslides/assignment/views.py | 2 +- openslides/motion/views.py | 2 +- openslides/static/images/bg-header.gif | Bin 625 -> 0 bytes openslides/static/images/bg-submenu.gif | Bin 85 -> 0 bytes openslides/static/images/button.gif | Bin 169 -> 0 bytes openslides/static/images/favicon.png | Bin 1060 -> 0 bytes openslides/static/{images => img}/circle.png | Bin openslides/static/{images => img}/draggable.png | Bin .../{images/logo.png => img/logo-small.png} | Bin .../static/{images => img}/tree-bottom.png | Bin openslides/static/{images => img}/tree.png | Bin openslides/static/styles/tabledrag.css | 8 ++++---- 13 files changed, 7 insertions(+), 21 deletions(-) delete mode 100644 openslides/static/images/bg-header.gif delete mode 100644 openslides/static/images/bg-submenu.gif delete mode 100644 openslides/static/images/button.gif delete mode 100644 openslides/static/images/favicon.png rename openslides/static/{images => img}/circle.png (100%) rename openslides/static/{images => img}/draggable.png (100%) rename openslides/static/{images/logo.png => img/logo-small.png} (100%) rename openslides/static/{images => img}/tree-bottom.png (100%) rename openslides/static/{images => img}/tree.png (100%) diff --git a/extras/benchmark/bench.py b/extras/benchmark/bench.py index edcfa3075..31e886d01 100755 --- a/extras/benchmark/bench.py +++ b/extras/benchmark/bench.py @@ -32,11 +32,7 @@ URL_SETS = { "/static/styles/base.css", "/static/javascript/utils.js", "/static/javascript/jquery.min.js", - "/static/images/bg-submenu.gif", - "/static/images/bg-header.gif", - "/static/images/logo.png", - "/static/images/icons/dialog-information.png", - "/static/images/icons/cross.png", + "/static/img/logo.png", ], "agenda": [ "/agenda/", @@ -46,11 +42,6 @@ URL_SETS = { "/static/styles/agenda.css", "/static/javascript/jquery.min.js", "/jsi18n/", - "/static/images/bg-header.gif", - "/static/images/bg-submenu.gif", - "/static/images/logo.png", - "/static/images/icons/application-pdf.png", - "/static/images/icons/cross.png", ], "application": [ "/application/", @@ -58,11 +49,6 @@ URL_SETS = { "/static/javascript/utils.js", "/static/javascript/jquery.min.js", "/jsi18n/", - "/static/images/bg-header.gif", - "/static/images/bg-submenu.gif", - "/static/images/icons/cross.png", - "/static/images/logo.png", - "/static/images/icons/application-pdf.png", ] } diff --git a/openslides/assignment/views.py b/openslides/assignment/views.py index aa6640aa4..46024e1d2 100644 --- a/openslides/assignment/views.py +++ b/openslides/assignment/views.py @@ -533,7 +533,7 @@ class AssignmentPollPDF(PDFView): pdf_document.build(story) def append_to_pdf(self, story): - imgpath = os.path.join(settings.SITE_ROOT, 'static/images/circle.png') + imgpath = os.path.join(settings.SITE_ROOT, 'static/img/circle.png') circle = "  " % imgpath cell = [] cell.append(Spacer(0, 0.8 * cm)) diff --git a/openslides/motion/views.py b/openslides/motion/views.py index a323b5594..2ab024a62 100644 --- a/openslides/motion/views.py +++ b/openslides/motion/views.py @@ -864,7 +864,7 @@ class MotionPollPDF(PDFView): pdf_document.build(story) def append_to_pdf(self, story): - imgpath = os.path.join(settings.SITE_ROOT, 'static/images/circle.png') + imgpath = os.path.join(settings.SITE_ROOT, 'static/img/circle.png') circle = "  " % imgpath cell = [] cell.append(Spacer(0,0.8*cm)) diff --git a/openslides/static/images/bg-header.gif b/openslides/static/images/bg-header.gif deleted file mode 100644 index c69df6fbdd2c6cece7062e7fe472a3b385cf92f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 625 zcmZ?wbhEHb< zLPyp{UqMqr)J#i8Sz1U>MZ#1|Mps2bT~0(pUeriKN=HfDKuyw0PfkZ!Tvx@wS6RY9RZ>q? z!b(@pN>5&09w;KNA}g$~Dq*TA!+;kk{$v5m>wrj*pBUKwA80A?(2?ptk+Sh%j@A4N z8pRH4qt@S8Q+9gqqJ0kv5`6S#pMSBXDz|Ot{SQ4ge(P_)|1`bsy!wy-4UJ9BEv;>h z@||7XJv}`A6DCfYJZ0)cwHY&Kam<-JZ~lUXix$sUTDE+}%9Z?U)~;K>VdEO1EnBy3 z-?4Lx>7Kp&*bW>#boj{8W5*A3pE`Z!?78z7&WK&Ua`oEv8<%Bn-?@A5{)5|!kDok! z_Dt*LtJmsp-@TXk`04YPuirlE{`~cu>+iq+49r|IKl^0{_ zLDSK03FE9g853KN_ba4!$an@dpPZ}_yecO1Q`70`2Fa)9yqwf>cD6%m!I#O zZ_m#m>$PRY#l;?z#e5HLS$SC~V6j)J!`4+-S4V6P`g&mN>g(&{wL4_Jx2?IkImvoO z?CEW5Z*R{^J~7vOdehzA6`x<-%@%LCzrTT*Th3?4hKC2Vg|y>z7HoWce1fv~JfEFL zPb6m;XX_obCU^SwR4 m`P&|OOncV3?A57l@3@bD^11%4_xZ1L-~aLRaHX>{SOWl7qalp| diff --git a/openslides/static/images/button.gif b/openslides/static/images/button.gif deleted file mode 100644 index 37ee553722aeca8cf04a3291ffa1d844cd80d722..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 169 zcmZ?wbhEHbWMU9!IKsf-HI3bE3X}g#zUT#V9#dJeRvL%S5ldgLU%SP(Y`t^UCeI}o zyb_nF`_AAFnk`hk&OUdQdCg|;heOSR(`DphQBD_mp4fEy_OWC2U+fJl&?46JGo sHYs?BXnKXJp8Omk#v*#O&`0=iz!d`zq2_}R1vsR585$foSezKF0XbYO%K!iX diff --git a/openslides/static/images/favicon.png b/openslides/static/images/favicon.png deleted file mode 100644 index a10d3081088e5196d989da6add813a16899d07e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1060 zcmV+<1l#+GP)yiaF!as5pI&yF zX`uzz_)R{Ud2hb?eBS5#{k}n|R0_NpA0K~DN_i)r&wmEKV2sT#E-v2B<#G?}_4+69 zFGBY(W@ctSG7RIEU!Yhlj;yV%ZBI;07@16FGM!G}qmIGHaUV?~{|0AKXL$c_m6D5^u-j@t^ATI#5dgv@ENMF-Db2 zrGI&OIp#PH5JJFl9B>>5wzjq$A;fR#bo#AmG|H}Z5DJAVp-@OfA`v(~J}&O>@8|aR z_71bz>|dO7V2lCh9K840+1WnJvR*$rI(oI2gH}0qc6Oc+LXLD@AIjx&Z~AiHsaC5G z9mfIJbz2Tx*9Frw@!;U#2mn02)&T&3rfC!aq<^neDm_|VUA?`#yZfxazh4au49IXe zEDD9fv-S1$+nT2R+{*#-k7**2_yYiLWipwUI}>ZQnnfucX*QdZ5F(|NrRnMEdM|Q- zjxlA7fl^9cm1tR34FGD_5%v_IltLH&7miMWZU$aB+M3K511V*<-2X1XIsgAkluRb) z3Wb7+F~)OqbMGRAKq-Z!lzPe}l~OH%;o;#2OG`^J#ux}8?t3@adkP_L{8UQ8>FMbk0Pwgau(`SU%fZ3HxDWz_ z5UqZAzXy+?8>yEogaATFJ{pZaZYxov(Wo1S(MHtkq`kfoLjI0MqwP&TIXU?TW85@N z6Z{AUgAfb`!7vOk3;%65K!{$(naYF#ER9*?&K!r}0# zZQEjKXegy=nyzV@jxp9T#yUdi5}qGWS4!zhDcyD5ALi%hKlLBF?V2n&lMRyq0000