Fix manage-viewlets

plone · Aug 28, 2015 · c38b556 · c38b556
1 parent 30b5d6e
commit c38b556
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 23 deletions.
diff --git a/plone/app/viewletmanager/manage-viewletmanager.pt b/plone/app/viewletmanager/manage-viewletmanager.pt
@@ -1,6 +1,6 @@
 <div class="managedViewlets" tal:attributes="id view/normalized_name"
      i18n:domain="plone">
-    <dl class="viewletmanager">
+    <dl class="viewletmanager" tal:define="auth_token context/@@authenticator/token">
         <dt>
             ViewletManager: <span tal:content="view/name">ViewletManager name</span>
             (<span tal:content="view/interface" />)
@@ -13,20 +13,19 @@
                     (<span tal:replace="viewlet/index">Index</span>)
                     <a class="up"
                        tal:condition="viewlet/up_url | nothing"
-                       tal:attributes="href viewlet/up_url">&#9650;</a>
+                       tal:attributes="href string:${viewlet/up_url}&_authenticator=${auth_token}">&#9650;</a>
                     <a class="down"
                        tal:condition="viewlet/down_url | nothing"
-                       tal:attributes="href viewlet/down_url">&#9660;</a>
+                       tal:attributes="href string:${viewlet/down_url}&_authenticator=${auth_token}">&#9660;</a>
                     <a class="hide"
                        i18n:translate="label_hide_item"
-                       tal:attributes="href viewlet/hide_url">Hide</a>
+                       tal:attributes="href string:${viewlet/hide_url}&_authenticator=${auth_token}">Hide</a>
                     <a class="show"
                        i18n:translate="label_show_item"
-                       tal:attributes="href viewlet/show_url">Show</a>
+                       tal:attributes="href string:${viewlet/show_url}&_authenticator=${auth_token}">Show</a>
                 </dt>
-                <dd>
+                <dd class="clearfix">
                     <div tal:replace="structure viewlet/content"></div>
-                    <div class="visualClear"><!-- --></div>
                 </dd>
             </dl>
         </dd>

diff --git a/plone/app/viewletmanager/manage-viewlets.pt b/plone/app/viewletmanager/manage-viewlets.pt
@@ -6,22 +6,6 @@
       metal:use-macro="here/main_template/macros/master"
       i18n:domain="plone">
 
-      <metal:css_slot fill-slot="style_slot">
-            <style type="text/css" media="screen">
-                .viewletmanager, .viewlet { display: block; margin: .5em;}
-                .viewletmanager { border: 1px solid #000;}
-                .viewletmanager > dt { border-bottom: 1px solid #000; }
-                .viewletmanager > dt, .viewlet > dt { font-size: .8em; background: #EEE; padding: .5em; }
-                .viewlet { border: 1px solid #999; }
-                .viewlet > dt { border-bottom: 1px solid #999; }
-                .viewlet > dt > a.show { display: none !important; }
-                .viewlet > dt > a.hide { display: inline !important; }
-                .viewletmanager dd, .viewlet dd { padding: .5em; }
-                .viewlet.hiddenViewlet > dt > a.hide { display:none !important; }
-                .viewlet.hiddenViewlet > dt > a.show { display: inline !important; }
-            </style>
-      </metal:css_slot>
-
       <metal:javascript_head_slot fill-slot="javascript_head_slot">
           <script type="text/javascript" charset="utf-8">
               (function($) {
@@ -40,6 +24,21 @@
 <body>
 <metal:main fill-slot="main">
 
+    <style type="text/css" media="screen">
+        .viewletmanager, .viewlet { display: block; margin: .5em;}
+        .viewletmanager { border: 1px solid #000;}
+        .viewletmanager > dt { border-bottom: 1px solid #000; }
+        .viewletmanager > dt, .viewlet > dt { font-size: .8em; background: #EEE; padding: .5em; }
+        .viewlet { border: 1px solid #999; }
+        .viewlet > dt { border-bottom: 1px solid #999; }
+        .viewlet > dt > a.show { display: none !important; }
+        .viewlet > dt > a.hide { display: inline !important; }
+        .viewletmanager dd, .viewlet dd { padding: .5em; }
+        .viewlet.hiddenViewlet { opacity: 0.5; }
+        .viewlet.hiddenViewlet > dt > a.hide { display:none !important; }
+        .viewlet.hiddenViewlet > dt > a.show { display: inline !important; }
+    </style>
+
     <div tal:replace="structure provider:plone.abovecontenttitle" />
 
     <h1 class="documentFirstHeading"