Permalink
Browse files

fix notfound in view subpaths, remove publish.pt

  • Loading branch information...
1 parent fa30995 commit b94c6d3463e5abd3ef5b6360555f00202a2bcbab @d-mo d-mo committed Nov 17, 2012
View
@@ -27,6 +27,7 @@ eggs = PasteScript
recipe = eqb.recipe.uwsgi
eggs =
${plone:eggs}
+ uwsgitop
PasteDeploy
[zserver-patch]
@@ -44,7 +44,13 @@
+
+ except NotFound:
+ response.setStatus(404)
-+ errorBody = parents[0].standard_error_message(error_type='NotFound')
++ i = 0
++ while True:
++ try:
++ errorBody = parents[i].standard_error_message(error_type='NotFound')
++ break
++ except:
++ i+=1
+ from plone.app.theming.transform import ThemeTransform
+ try:
+ errorBody = ThemeTransform(None, request).transformIterable([errorBody],'utf-8').serialize()
@@ -1,95 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
- lang="en"
- metal:use-macro="here/main_template/macros/master"
- i18n:domain="plumi">
-
-<head>
- <metal:block fill-slot="top_slot"
- tal:define="dummy python:request.set('disable_border',1)" />
-</head>
-
-<body>
-
- <tal:block tal:condition="exists: here/portal_skins | nothing"
- tal:replace="nothing">
- <tal:block tal:condition="here/portal_skins/updateSkinCookie | nothing"
- tal:define="dummy here/setupCurrentSkin" />
- </tal:block>
-
- <div metal:fill-slot="main">
- <div tal:define="came_from request/came_from|nothing;
- initial_login request/initial_login|nothing;
- js_enabled python:request.get('js_enabled','1')!='0';
- portal context/@@plone_portal_state/portal;
- home_url portal/portal_membership/getHomeUrl|nothing;
- base_path python: home_url and home_url + '/videos' or ''">
-
- <div tal:condition="initial_login">
- <p i18n:translate="description_logged_in_explain">
- Now that you have registered and logged in you'll notice that the site looks a little different. You can add videos, events, news, set up your members workspace or personalise your profile page.
- Take the time to have a look around the site and explore what you can do. Check out the <a tal:attributes="href string:${portal_url}/help-and-tutorials">help and tutorials page</a> for more information.
- </p>
-
- </div>
-
- <div tal:condition="not:initial_login"><p></p>
- </div>
-
- <div class="loginOption">
- <strong>
- <a class="optionHeader" tal:attributes="href string:${base_path}/@@publish_video" i18n:translate="">Publish Video</a>
- </strong><br />
- <tal:publish_video_blurb i18n:translate="publish_video_blurb">
- Share your productions by uploading video to
- <span tal:replace="portal/Title" i18n:name="site_name">EngageMedia</span>.
- Videos will be automatically submitted for publishing approval.
- </tal:publish_video_blurb>
- <a tal:attributes="href string:${portal_url}/editorial-policy"
- i18n:translate="view_editorial_policy" i18n:domain="plumi">View editorial policy</a>.
- </div>
-
- <div class="loginOption" tal:condition="home_url">
- <strong>
- <a class="optionHeader" tal:attributes="href string:${home_url}/events/createObject?type_name=Event" i18n:translate="">Publish Event</a>
- </strong><br />
- <tal:publish_event_blurb i18n:translate="publish_event_blurb">
- List your events such as screenings, film festivals or workshops here.
- </tal:publish_event_blurb>
- </div>
-
- <div class="loginOption" tal:condition="home_url">
- <strong>
- <a class="optionHeader" tal:attributes="href string:${home_url}/news/createObject?type_name=News Item" i18n:translate="">Publish News</a>
- </strong><br />
- <tal:publish_news_blurb i18n:translate="publish_news_blurb">
- Tell us news about your past and future productions and promote your work.
- </tal:publish_news_blurb>
- </div>
-
-
- <div tal:condition="not:js_enabled">
- <p i18n:translate="description_javascript_advantage">
- You can take fuller advantage of the features of this site
- if you enable javascript in your browser.
- </p>
-
- <p i18n:translate="description_enable_cookies_for_login">
- Note: If you do not remain logged in after leaving this
- page, it is because you need to
- <span i18n:name="enable_cookies">
- <a href="enabling_cookies"
- i18n:translate="label_enable_cookies">
- enable cookies
- </a>
- </span>
- in your browser.
- </p>
- </div>
-
- </div>
-
- </div>
-
-</body>
-</html>
-
@@ -1,2 +0,0 @@
-[security]
-View = 0:Authenticated

0 comments on commit b94c6d3

Please sign in to comment.