Changeset 24837

Timestamp:

Oct 10, 2013, 10:29:39 PM (11 years ago)

Author:

rvelices

Message:

improved who can see this photo display

Location:

trunk/themes/default

Files:

• fix-ie5-ie6.css (modified) (1 diff)
• fix-ie7.css (modified) (1 diff)
• template/picture.tpl (modified) (2 diffs)
• theme.css (modified) (1 diff)

trunk/themes/default/fix-ie5-ie6.css

@@ -70 +70 @@
 .imageInfo dt  {display:block; text-align:left; font-weight:bold; padding-right:0.5em;}
 .imageInfo dd {display:block; text-align:left; font-weight:normal;}
-.relSwitchBox {position:static;}
 #imageInfos dd { margin: 0 0 5px 20px;}

trunk/themes/default/fix-ie7.css

@@ -27 +27 @@
 .imageInfo dt  {display:block; text-align:left; font-weight:bold; padding-right:0.5em;}
 .imageInfo dd {display:block; text-align:left; font-weight:normal;}
-.relSwitchBox {position:static;}
 #imageInfos dd { margin: 0 0 5px 20px;}

trunk/themes/default/template/picture.tpl

@@ -272 +272 @@
 
 {if $display_info.privacy_level and isset($available_permission_levels)}
-        <div id="Privacy" class="imageInfo"><div class="relSwitchBox">
-                <dt><a id="privacyLevelLink" href="javascript:togglePrivacyLevelBox()">{'Who can see this photo?'|@translate}</a></dt>
-                <dd>
+        <div id="Privacy" class="imageInfo">
+                <dt>{'Who can see this photo?'|@translate}</dt>
+                <dd>
+                        <div>
+                                <a id="privacyLevelLink" href>{$available_permission_levels[$current.level]}</a>
+                        </div>
 {combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'}
-{footer_script require='jquery'}
-{literal}function setPrivacyLevel(rootUrl, id, level)
-{
-var y = new PwgWS(rootUrl);
-y.callService(
-        "pwg.images.setPrivacyLevel", {image_id: id, level:level} ,
+{footer_script require='jquery'}{strip}
+function setPrivacyLevel(id, level){
+(new PwgWS('{$ROOT_URL}')).callService(
+        "pwg.images.setPrivacyLevel", { image_id:id, level:level},
         {
                 method: "POST",
@@ -287 +288 @@
                 onSuccess: function(result) {
                           jQuery('#privacyLevelBox .switchCheck').css('visibility','hidden');
-                          jQuery('#levelCheck'+level).css('visibility','visible');
+                                jQuery('#switchLevel'+level).prev('.switchCheck').css('visibility','visible');
+                                jQuery('#privacyLevelLink').text(jQuery('#switchLevel'+level).text());
                 }
         }
         );
 }
-function togglePrivacyLevelBox()
-{
-        var elt = document.getElementById("privacyLevelBox"),
-                ePos = document.getElementById("privacyLevelLink");
-        if (elt.style.display == "none")
-        {
-                elt.style.left = (ePos.offsetLeft)+"px";
-                elt.style.top = (ePos.offsetTop+ePos.offsetHeight)+"px";
-                elt.style.display="block";
-        }
-        else
-                elt.style.display="none";
-}
-{/literal}
-{/footer_script}
-
-                        <div id="privacyLevelBox" class="switchBox" onclick="togglePrivacyLevelBox()" style="display:none" onmouseout="e=event.toElement||event.relatedTarget;e.parentNode==this||e==this||togglePrivacyLevelBox()">
+(SwitchBox=window.SwitchBox||[]).push("#privacyLevelLink", "#privacyLevelBox");
+{/strip}{/footer_script}
+                        <div id="privacyLevelBox" class="switchBox" style="display:none">
                                 {foreach from=$available_permission_levels item=label key=level}
-                                        <span id="levelCheck{$level}" class="switchCheck" {if $level != $current.level} style="visibility:hidden"{/if}>&#x2714; </span>
-                                        <a id="switchLevel{$level}" href="javascript:setPrivacyLevel('{$ROOT_URL}', {$current.id}, {$level})">{$label}</a><br>
+                                        <span class="switchCheck"{if $level != $current.level} style="visibility:hidden"{/if}>&#x2714; </span>
+                                        <a id="switchLevel{$level}" href="javascript:setPrivacyLevel({$current.id},{$level})">{$label}</a><br>
                                 {/foreach}
                         </div>
-
-                </dd>
-        </div></div>
+                </dd>
+        </div>
 {/if}
 {/strip}

trunk/themes/default/theme.css

@@ -377 +377 @@
   padding-bottom:5px;
   margin-bottom:5px;
-}
-
-.relSwitchBox {
-        position: relative;
 }