From a2cec8b5f151cfeaeb6ab2ec51fd49c327609958 Mon Sep 17 00:00:00 2001 From: Lakshmi Vyasarajan Date: Wed, 4 Apr 2012 17:11:08 +0530 Subject: [PATCH 1/6] Updated the download page to use version variable from site.yaml --- content/download/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/download/index.html b/content/download/index.html index dac2474..dbf382f 100644 --- a/content/download/index.html +++ b/content/download/index.html @@ -90,7 +90,7 @@ $("#gzipped") .html(bytes_to_kb(size * 0.322) + ' gzipped'); // build choice - var build = $('input[name="build"]').filter(':checked').val() || 'v1.2.6'; + var build = $('input[name="build"]').filter(':checked').val() || 'v{{ jqt.v }}'; // download link $("#downloadLink").attr( @@ -206,7 +206,7 @@

Version

From 7711aafe52aa9473245dd4c5a0cfd2e4ecd63801 Mon Sep 17 00:00:00 2001 From: Lakshmi Vyasarajan Date: Wed, 4 Apr 2012 17:12:50 +0530 Subject: [PATCH 2/6] Updated jQuery version --- content/download/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/download/index.html b/content/download/index.html index dbf382f..ca0a738 100644 --- a/content/download/index.html +++ b/content/download/index.html @@ -237,7 +237,7 @@

Include jQuery

-

jQuery 1.6.4

+

jQuery 1.7.2

All tools depend on this library (except flashembed). Can alternatively be included from googleapis (see below)

From 3eb2f90a6ba4e71b5a8f52f9bda2eadb5dfb5a02 Mon Sep 17 00:00:00 2001 From: Lakshmi Vyasarajan Date: Fri, 2 Nov 2012 17:16:08 +0530 Subject: [PATCH 3/6] Fixed hyde requirements --- requirements.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/requirements.txt b/requirements.txt index 4e1aa63..a28e6a5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,5 @@ +pyquery pygments +-e git://github.com/hyde/typogrify.git#egg=typogrify-hyde -e git://github.com/hyde/Python-Markdown.git#egg=Python-Markdown --e git://github.com/hyde/hyde.git#egg=hyde -argparse --e git://github.com/hyde/typogrify.git#egg=typogrify --e git://github.com/mitsuhiko/jinja2.git#egg=jinja2 -pyquery \ No newline at end of file +-e git://github.com/hyde/hyde.git#egg=hyde \ No newline at end of file From 780a64468323f68359d173c1763148531250860c Mon Sep 17 00:00:00 2001 From: Lakshmi Vyasarajan Date: Mon, 8 Apr 2013 12:10:24 +0530 Subject: [PATCH 4/6] Add maxcdn credit and use local node_modules for stylus. --- layout/root.j2 | 2 ++ package.json | 3 ++- site.yaml | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/layout/root.j2 b/layout/root.j2 index 19cb1d1..163dc82 100644 --- a/layout/root.j2 +++ b/layout/root.j2 @@ -137,6 +137,8 @@ /website | report a bug + | + Accelerated by MaxCDN diff --git a/package.json b/package.json index a706a1a..489e295 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,8 @@ "node": "~v0.4.11" }, "dependencies": { - "uglify-js": ">= 1.1.1" + "uglify-js": ">= 1.1.1", + "stylus": ">= 0.32" }, "devDependencies": {} } diff --git a/site.yaml b/site.yaml index 496ba44..67e81e1 100644 --- a/site.yaml +++ b/site.yaml @@ -44,7 +44,7 @@ meta: user interface library, web 2.0 ui library author: Tero Piirainen stylus: - app: /usr/local/bin/stylus + app: ./node_modules/stylus/bin/stylus sorter: index: attr: From d7cc9243fecaa7511f5df61ff688f1333faabc08 Mon Sep 17 00:00:00 2001 From: Lakshmi Vyasarajan Date: Mon, 8 Apr 2013 12:51:12 +0530 Subject: [PATCH 5/6] Prepare for production push. - Add s3 publisher - Remove defunct environment files - Fix a sidebar css issue --- content/media/css/style.styl | 2 +- dev.yaml | 10 ---------- prod.yaml | 11 ++++++----- requirements.txt | 2 ++ stage.yaml | 6 +----- 5 files changed, 10 insertions(+), 21 deletions(-) delete mode 100644 dev.yaml diff --git a/content/media/css/style.styl b/content/media/css/style.styl index 4442cfc..7abbc6d 100644 --- a/content/media/css/style.styl +++ b/content/media/css/style.styl @@ -54,7 +54,7 @@ p #right float right - width 24% + width 25% #wrap, #top-wrap, #bottom-wrap clearfix() diff --git a/dev.yaml b/dev.yaml deleted file mode 100644 index 3f07336..0000000 --- a/dev.yaml +++ /dev/null @@ -1,10 +0,0 @@ -extends: site.yaml -mode: development -base_url: / -site_root: dev26.jquerytools.org -site_url: http://dev26.jquerytools.org -fpsite: http://dev26.flowplayer.org/ -stylus: - app: %STYLUS_PATH -uglify: - app: %UGLIFY_PATH \ No newline at end of file diff --git a/prod.yaml b/prod.yaml index dd43006..ca59d48 100644 --- a/prod.yaml +++ b/prod.yaml @@ -4,9 +4,10 @@ base_url: / site_root: jquerytools.org site_url: http://jquerytools.org fpsite: http://flowplayer.org/ -stylus: - app: %STYLUS_PATH -uglify: - app: %UGLIFY_PATH analytics: - id: UA-5877901-1 #Google Analytics Tracking ID \ No newline at end of file + id: UA-5877901-1 #Google Analytics Tracking ID +publisher: + default: + type: hyde.ext.publishers.pyfs.PyFS + url: s3://jquerytools.org + check_etag: md5 \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index a28e6a5..247fea4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,7 @@ pyquery pygments +fs +boto -e git://github.com/hyde/typogrify.git#egg=typogrify-hyde -e git://github.com/hyde/Python-Markdown.git#egg=Python-Markdown -e git://github.com/hyde/hyde.git#egg=hyde \ No newline at end of file diff --git a/stage.yaml b/stage.yaml index 2e0c73d..3579a0f 100644 --- a/stage.yaml +++ b/stage.yaml @@ -3,8 +3,4 @@ mode: production base_url: / site_root: stage.jquerytools.org site_url: http://stage.jquerytools.org -fpsite: http://stage.flowplayer.org/ -stylus: - app: %STYLUS_PATH -uglify: - app: %UGLIFY_PATH \ No newline at end of file +fpsite: http://stage.flowplayer.org/ \ No newline at end of file From dae25ffaf0ed24c9d54aff91265ed76af2d3c69c Mon Sep 17 00:00:00 2001 From: Lakshmi Vyasarajan Date: Sun, 19 May 2013 12:27:36 +0530 Subject: [PATCH 6/6] Add maxcdn logo to sidebar --- content/media/css/include/sidebar.styl | 8 ++++++++ content/media/img/MaxCDN-Black-200x33.png | Bin 0 -> 1023 bytes layout/root.j2 | 6 ++++++ 3 files changed, 14 insertions(+) create mode 100644 content/media/img/MaxCDN-Black-200x33.png diff --git a/content/media/css/include/sidebar.styl b/content/media/css/include/sidebar.styl index b7dfd10..7b0f1b8 100644 --- a/content/media/css/include/sidebar.styl +++ b/content/media/css/include/sidebar.styl @@ -15,6 +15,14 @@ box-shadow 0px 0px 4px 4px rgba(petrol, 0.3) +.max_cdn + margin-top 32px + + img + margin-top 12px + text-align center + width 200px + height 33px nav diff --git a/content/media/img/MaxCDN-Black-200x33.png b/content/media/img/MaxCDN-Black-200x33.png new file mode 100644 index 0000000000000000000000000000000000000000..5c7fdfa80c7287e4344053b3564397d01063492a GIT binary patch literal 1023 zcmeAS@N?(olHy`uVBq!ia0vp^CxBRygBeJ!J}dGJNErwCgt!7}Qo&+Yx066U0wqCy z!3+%!``@285JG+wUM{`UMujJaB{LTJ^8=?o5$U? zb2l2qg{I#N)7bX0M?du?`}4O8_P!AR{l(_`B0uTc34CV3oiEn>ymq5=*F(!|lkau7 zWw?7Bskp26ZOgXu{p)v~WSpIUzT&irU}JE?93j!)HuJwY?yZ$k`SxbE$2RuA3LUL3 z*KPR4FPZ>yd;aGZ2h zJn3F=;bzeadFKa_Eq%IM6HdAudOUa81P!yROp8tKwa=X9(R}Di>jVp<$$SrHJGA$- zU7fqs#=XhKM@8iHW$t^-NAGeT)OxyVzPf@xbH3JxGqbMGF!HFhTEA-xPs>{;uSuTf zGjcBXxCd~F##q(FvfO1pa9V+-t6FdE;R$jQrOf*aYUU+|cbrl1;#F>UVp_0+^-z-N zM1~75cJj%*ye%eNID1`Q=*lPhb6#D|baAgb5FeJAG0QH$L~Tp|M&3CGJMMb^c$|a4q8O$ys{eqpAddUfy;2 zOD*3c2G$oYb6)LRpBnE}D1G^9(Xog7_+qB>%r<|C)k>_^}efi3%4o%$V%= zzmh3AqnggcRFbH%F4Vtj$4AY(FI(6jD;;>SW~1r1MUsZ@JlCQa#IJ4YYP>DI@2eA)sLZYWpY?U>0n^&u zkNKqDPt>rrF4&nH^IdB8_FrvJUqzeLCcf2saG8I~=>&6Qi}ze-UsXs{{e1oE^ zdXWih&xFT(YE;@NF1>g2@uO@%qcnFm7q2t-O#8p+n)UwJfBUaq|5;gKbA(}C%ZJ=m jXETOWofwHlutDnm{r-UW|Ck)LM literal 0 HcmV?d00001 diff --git a/layout/root.j2 b/layout/root.j2 index 163dc82..463d040 100644 --- a/layout/root.j2 +++ b/layout/root.j2 @@ -124,6 +124,12 @@ Book Cover +
+

Our CDN sponsor

+ + Max CDN + +
{% endblock %}