Merge branch 'master' of github.com:zotonic/zotonic

rpip · May 14, 2012 · fa7d759 · fa7d759
2 parents ac22ea2 + 2a46efc
commit fa7d759
Show file tree

Hide file tree

Showing 53 changed files with 1 addition and 1,729 deletions.
diff --git a/modules/mod_survey/dispatch/survey b/modules/mod_survey/dispatch/survey
@@ -1,6 +1,6 @@
 [
     {survey_results_download,  ["survey", "results", "download", id],  resource_survey_results, []},
-    {survey_results_printable, ["survey", "results", "printable", id],  resource_page, [ {template, "survey_results_printable.tpl"}, {acl, {module, mod_survey}} ]},
+    {survey_results_printable, ["survey", "results", "printable", id],  resource_admin, [ {acl, {module, mod_survey}}, {template, "survey_results_printable.tpl"} ]},
 
     {survey_results, ["survey", "results", id],       resource_page, [ {template, "survey_results.tpl"} ]},
     {survey_results, ["survey", "results", id, slug], resource_page, [ {template, "survey_results.tpl"} ]},

diff --git a/priv/sites/zotonicwww/config.in b/priv/sites/zotonicwww/config.in
diff --git a/priv/sites/zotonicwww/demodata/learnmore.html b/priv/sites/zotonicwww/demodata/learnmore.html
diff --git a/priv/sites/zotonicwww/demodata/welcome.html b/priv/sites/zotonicwww/demodata/welcome.html
diff --git a/priv/sites/zotonicwww/dispatch/dispatch b/priv/sites/zotonicwww/dispatch/dispatch
diff --git a/priv/sites/zotonicwww/files/dropbox/.empty b/priv/sites/zotonicwww/files/dropbox/.empty
diff --git a/priv/sites/zotonicwww/files/preview/.empty b/priv/sites/zotonicwww/files/preview/.empty
diff --git a/...preview/lib/images/vimeo.jpg(40x18)(crop)(7C040E02D015B714C5AB4FD6CB9951AA).jpg b/...preview/lib/images/vimeo.jpg(40x18)(crop)(7C040E02D015B714C5AB4FD6CB9951AA).jpg
diff --git a/priv/sites/zotonicwww/files/processing/.empty b/priv/sites/zotonicwww/files/processing/.empty
diff --git a/priv/sites/zotonicwww/files/unhandled/.empty b/priv/sites/zotonicwww/files/unhandled/.empty
diff --git a/priv/sites/zotonicwww/lib/css/zp-compressed.css b/priv/sites/zotonicwww/lib/css/zp-compressed.css
diff --git a/priv/sites/zotonicwww/lib/css/zp-ie.css b/priv/sites/zotonicwww/lib/css/zp-ie.css