update src, scripts, etc from 2012

author: dumpfmprod <dumpfmprod@ubuntu.(none)> 2012-07-17 21:40:57 -0400
committer: dumpfmprod <dumpfmprod@ubuntu.(none)> 2012-07-17 21:40:57 -0400
commit: da15cfb1e452a0af4902272ba351d5a6d0d0b56a (patch)
tree: 8525e56790625ab7b67e4c534fdf1739d0f592b6 /template
parent: 38091d8e194aa48f6bd64e2cf8ccba6fd27c36a2 (diff)
12 files changed, 133 insertions, 212 deletions
diff --git a/template/banner.st b/template/banner.st
index 5927a62..0ab1a7b 100644
--- a/template/banner.st
+++ b/template/banner.st
@@ -72,8 +72,10 @@
      <div id="dumplist">
 
         $if(user_nick)$
-        <a href="http://dump.fm/fullscreen">checkout dump.fm in full-screen </a> - <a href="http://abcdef4.dump.fm/">MYSTERY ROOM!!!!!!!! </a> $else$ <style>#dumplist{z-index:-1!important;}</style> $endif$	
-        $if(isadmin)$ - <a href="http://vip.dump.fm/">NAUGHTY BOYS DELIGHT </a>
+        <a href="http://dump.fm/fullscreen">checkout dump.fm in full-screen </a>
+	- <a href="http://abcdef4.dump.fm/">MYSTERY ROOM!!!!!!!! </a>
+	$else$ <style>#dumplist{z-index:-1!important;}</style> $endif$	
+        $if(isadmin)$ - <a href="http://vip.dump.fm/">NAUGHTY GIRLS/AND-OR/BOYS DELIGHT </a>
         $endif$
       </div>
    
@@ -104,4 +106,4 @@
           <a id="search-control-close" href="javascript:Search.close()">close</a>
         </div>
         <div id="search-results-images"></div>
-      </div>
-\ No newline at end of file
+      </div>
diff --git a/template/fame.st b/template/fame.st
index d773447..52cab6d 100644
--- a/template/fame.st
+++ b/template/fame.st
@@ -3,7 +3,7 @@
     <title>dump.fm hall of fame</title>
     $head()$
     <script>
-      jQuery(document).ready(initLog);
+      jQuery(document).ready(function(){ initLog () });
     </script>
   </head>
   <body>
diff --git a/template/footer.st b/template/footer.st
index 5987bd1..c7980d9 100644
--- a/template/footer.st
+++ b/template/footer.st
@@ -1,8 +1,7 @@
 
-@2010 <a href="/">dump.fm</a>
-<a href="http://dump.fm/about_us" style="word-spacing: normal">About Us</a> 
+<a href="/">dump.fm</a>
+<!--<a href="http://dump.fm/about_us" style="word-spacing: normal">About Us</a> 
 <a href="http://dump.fm/help" style="word-spacing: normal">Help FAQ</a> 
-<a href="http://dump.fm/terms">Terms</a>
-<a href="http://dump.fm/privacy">Privacy</a>
+<a href="http://dump.fm/terms">Terms</a>-->
 $google_analytics()$
 $debug_log()$
diff --git a/template/frontpage.st b/template/frontpage.st
index 22c780c..e8ceea6 100644
--- a/template/frontpage.st
+++ b/template/frontpage.st
@@ -431,7 +431,7 @@ jQuery(window).load(function(){
     <a href="$domain$/tags" onclick="pageTracker._trackEvent('button', 'banner-search'); return true;"><img src="$domain$/static/img/thumbs/searchbaricon.png"/> Tags</a>
 </div>-->
     <iframe src="http://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com%2Fpages%2Fdumpfm%2F240317626149&amp;layout=button_count&amp;show_faces=false&amp;width=450&amp;action=like&amp;font=tahoma&amp;colorscheme=light&amp;height=21" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:100px; height:21px;" allowTransparency="true"id="fblike"></iframe>
-           <a href="$domain$/register" id="disregister">Register!</a>
+    <!--       <a href="$domain$/register" id="disregister">Register!</a>-->
 	   $endif$     
 
            <div id="searchbox">
@@ -468,13 +468,16 @@ jQuery(window).load(function(){
       <iframe src="$domain$/fullscreen" style="overflow:hidden;width:240px;height:200px;border:0px;"></iframe> 
     </div>
     $else$
-    <div class="alttxt">
-      dump.fm is a real-time image chat!<br><br>
-      check out our top dumps
+    <div class="alttxt"style="font-size:18px;text-transform:uppercase;text-align:left">
+      dump.fm is an elite real-time image chat community. we host more than 1,500,000 images.  
+     
+      register  <a href="http://dump.fm/register">here.</a> 
+      <br>view the dump.fm feed in <a href="/fullscreen">fullscreen. :)</a>
+      <!--  <br> <br>  <iframe src="$domain$/fullscreen" style="overflow:hidden;width:240px;height:200px;border:0px;"></iframe> 
       <br><br>
-      <strong>
-        <a href="$domain$/login" class="signin">sign in</a></strong> or <strong><a href="$domain$/register">register</a>
-      </strong>
+     <strong>
+        <a href="$domain$/login" class="signin">sign in</a></strong>or <strong><a href="$domain$/register">register</a>
+      </strong>-->
     </div>
     $endif$
   </div>
@@ -498,7 +501,7 @@ $endif$
      
 <!--START FOOTER
               $footer()$-->
-<br><br><center>
+<!--<br><br><center>
 <div id="footer">
 @2011 <a href="/">dump.fm</a>
 <a href="$domain$/about_us" style="word-spacing: normal">About Us</a> 
@@ -506,7 +509,7 @@ $endif$
 <a href="$domain$/terms">Terms</a>
 <a href="$domain$/privacy">Privacy</a>
 </div></center>
-</div>
+</div>-->
 $google_analytics()$
 $debug_log()$
 
@@ -526,3 +529,4 @@ $debug_log()$
 <script type="text/javascript">m00=document.getElementsByTagName("img");m01=m00.length;function images_loading_bar(){m02=0;for(i=0;i<m01;i++)m02+=(m00[i].complete)?1:0;document.getElementById("LB1").style.width=Math.round(m02/m01*100)+'px';if(m02==m01)setTimeout("document.getElementById('LB0').style.display='none'",128); else setTimeout("images_loading_bar()", 64);};images_loading_bar();</script> 
   </body>
 </html>
+
diff --git a/template/fullscreen.st b/template/fullscreen.st
index 9ccf0c1..9556bf2 100644
--- a/template/fullscreen.st
+++ b/template/fullscreen.st
@@ -25,11 +25,22 @@
           box-sizing: border-box; -webkit-box-sizing: border-box; -moz-box-sizing: border-box;
       }
       #loginbox {
-          background: white;
-          z-index: 999;
-          position: absolute;
-          display: none;
-      }
+background: white;
+z-index: 999;
+position: absolute;
+font-size: 20%;
+width: 335px;
+height: 220px;
+margin-left: -170px;
+left: 50%;
+border: 1px solid;
+padding: 2%;
+top: 20%;
+text-align: justify;
+-moz-box-shadow: -1px 1px #000,-2px 2px #000,-3px 3px #000,-4px 4px #000,-5px 5px #000,-6px 6px #000;
+-webkit-box-shadow: -1px 1px black,-2px 2px black,-3px 3px black,-4px 4px black,-5px 5px black,-6px 6px black;
+box-shadow: -1px 1px black,-2px 2px black,-3px 3px black,-4px 4px black,-5px 5px black,-6px 6px black;
+}
       #logininner {
           width: 30em;
           height: 20em;
@@ -42,13 +53,9 @@
       }
       #formcontainer {
           padding: 0;
-          margin-top: 20%;
           width: 80%;
           position: relative;
       }
-      #nickInput, #passwordInput {
-          width: 100%;
-      }
       #piccol {
           width: 50%;
           float: right;
@@ -60,7 +67,6 @@
       }
       #spinner { display: none; }
       #forgetpw {
-          position: absolute;
           left: 5px;
           bottom: 5px;
           font-size: 80%;
@@ -80,65 +86,80 @@
           text-align: center;
           margin-top: 250px;
       }
-
-      #loginclose {
-          position: absolute;
-          right: 3px;
-          top: 3px;
-      }
-      #big-image{font-size:50px;text-align: justify; text-justify: newspaper;   text-shadow: 1px 1px #eee, 2px 2px #f0e, 3px 3px #eee,4px 4px #f0e,5px 5px #eee, 3px 3px #eee,4px 4px #f0e,5px 5px #eee,6px 6px #f0e,6px 6px #eee,7px 7px #f0e,7px 7px #eee,8px 8px #f0e,8px 8px #eee,9px 9px #f0e,9px 9px #eee; color:#fff}
+      input {max-width: 100px;
+-moz-box-shadow: -1px 1px #000,-2px 2px #000,-3px 3px #000,-4px 4px #000,-5px 5px #000,-6px 6px #000;
+-webkit-box-shadow: -1px 1px black,-2px 2px black,-3px 3px black,-4px 4px black,-5px 5px black,-6px 6px black;
+box-shadow: -1px 1px black,-2px 2px black,-3px 3px black,-4px 4px black,-5px 5px black,-6px 6px black;
+border: 1px solid;}
+input:hover {
+	-moz-box-shadow: -1px 1px #000,-2px 2px #000,-3px 3px #000;
+	-webkit-box-shadow: -1px 1px #000,-2px 2px #000,-3px 3px #000;
+	box-shadow: -1px 1px #000,-2px 2px #000,-3px 3px #000,inset -2px 2px 2px #333;
+	margin-top: 2px;
+	margin-left: -2px;}
+	input:active {
+	-moz-box-shadow: 0px 0px white;
+	-webkit-box-shadow: 0px 0px white;
+	box-shadow: -1px 1px #000,0px 0px white;
+	margin-top: 2px;
+	margin-left: -4px;
+	box-shadow: inset -3px 3px 4px #333;
+	cursor: pointer;}
+#remembermeInput {
+	margin-top: 0; margin-left: 0;
+}
+      #big-image{font-size:20px;text-align: left; text-justify: newspaper;    color:#000}
       #memelogo { position: fixed; z-index: 999; bottom: 30px; right: 80px; }
       .sublogo { font-family: Monaco, "Courier New", Courier, monospace; }
       a { color:#000 }
+      #toplogo{position: fixed;display:none;
+top: 0;
+left: 0;}
+#big-image {cursor:url('http://dump.fm/static/img/thumbs/heartfaved.gif'), pointer}
     </style>
     <script>jQuery(initLogin)</script>
   </head>
   <body>
-     <div id="loginbox">
-       <div id="logininner">
-         <div id="infocol">
-           <center>
-           <div id="formcontainer">
+
+
+      $if(user_nick)$
+<!--          
+               <div id="loginbox">
+       <img src="http://wiki.bennington.edu/mediawiki/images/9/9e/Dumplogo.gif"><br>
+          <p> this is dump.fm, the first ever real-time image sharing website. behind me is a fullscreen feed of whats currently going on. 
+           if you're a member of the club, sign in below. if not feel free to <a href="#" onclick="jQuery('#loginbox').hide(); return false;">close this window</a> and enjoy the sick pix.</p>
              <form onsubmit="login(); return false;">
-             <div align="left">username</div>
-             <div><input id="nickInput"></div>
-             <br>
-             <div align="left">password</div>
-             <div><input id="passwordInput" type="password"></div>
-             <div align="right" style="font-size: 80%">remember me? <input id="remembermeInput" type="checkbox" checked="true"></div>
-             <br>
-             <div>
-               <center><input type="submit" value="LOGIN"></center>
+             <p>username : <input id="nickInput"></p>
+             <p>password : <input id="passwordInput" type="password"></p>
+           <p>
+                remember me? <input id="remembermeInput" type="checkbox" checked="true"> <input type="submit" value="LOGIN"></p>
+
                <img id="spinner" src="/static/img/spinner.gif">
-             </div>
              </form>
-           </div>
-           </center>
-         </div>
-         <div id="piccol">
-           <center><img id="loginimg" src="/static/img/danceman.gif"></center>
-           <center><i>join the party</i></center>
-         </div>
          <div id="errormsg"></div>
          <div id="forgetpw"><a href="$domain$/reset">forgot password?</a></div>
-         <div id="loginclose"><a href="#" onclick="jQuery('#loginbox').hide(); return false;">X</a></div>
-       </div>
-     </div>
-
-    <div id="memelogo">
-  
-      <br>
-      <div class="sublogo">
-      $if(user_nick)$
-       <img src="/static/img/thumbs/heart.gif">click to fav
+          <a href="/chat"id="toplogo"><img src="http://wiki.bennington.edu/mediawiki/images/9/9e/Dumplogo.gif"></a> <img src="http://dump.fm/static/img/thumbs/heartfaved.gif" id="fav-indicator">
+	</div>
+-->
       $else$
-<a href="http://dump.fm"><img src="http://dump.fm/static/img/dumppixelhover.png" class="memelogo"></a>
-      <a href="#" onclick="showLogin(); return false;">LOGIN</a> | <a href="$domain$/register">REGISTER</a>
+         <div id="loginbox">
+       <img src="http://wiki.bennington.edu/mediawiki/images/9/9e/Dumplogo.gif"><br>
+          <p> this is dump.fm, the first ever real-time image sharing website. behind me is a fullscreen feed of whats currently going on. 
+           if you're a member of the club, sign in bellow. if not feel free to <a href="#" onclick="jQuery('#loginbox').hide(); return false;">close this window</a> and enjoy the sick pix.</p>
+             <form onsubmit="login(); return false;">
+             <p>username : <input id="nickInput"></p>
+             <p>password : <input id="passwordInput" type="password"></p>
+           <p>
+                remember me? <input id="remembermeInput" type="checkbox" checked="true"> <input type="submit" value="LOGIN"></p>
+
+               <img id="spinner" src="/static/img/spinner.gif">
+             </form>
+         <div id="errormsg"></div>
+         <div id="forgetpw"><a href="$domain$/reset">forgot password?</a></div>
+	</div>
       $endif$
-      </div>
-    </div>
-    <div id="big-image">waiting 4 new image from dump.fm.............</div>
-    <img src="http://dump.fm/static/img/thumbs/heartfaved.gif" id="fav-indicator">
+
+    <div id="big-image"></div>
     <script>
       initFullscreen()
     </script>
diff --git a/template/fullscreen_front.st b/template/fullscreen_front.st
index 22f2d65..fab8ef9 100644
--- a/template/fullscreen_front.st
+++ b/template/fullscreen_front.st
@@ -22,7 +22,7 @@
 
       #spinner { display: none; }
       #forgetpw {
-          position: absolute;
+          position: absolute;display:none;
           left: 5px;
           bottom: 5px;
           font-size: 80%;
diff --git a/template/messagepane.st b/template/messagepane.st
index 1005679..94da6e9 100644
--- a/template/messagepane.st
+++ b/template/messagepane.st
@@ -2,21 +2,26 @@
   $if(user_nick)$
   <div id="userList">
     $users: { u |
-    <div class="username"><a href="/$u.nick$" target="_blank">
+    <div class="username"><a href="/$u.nick$" target="_blank"> 
         $u.score_ent$
         $if(u.avatar)$
+      
         <img src="$u.avatar$" width="50" height="50">
         $else$
+
         <img src="/static/img/noinfo.png">
         $endif$
-        $u.nick$</a><br>
+        $u.nick$
+       
+        </a>
+        <br>
     </div>
     }$
   </div>$endif$
   <div id="favbox" style="display: hidden"></div>
   <div id="messageList">
     $messages: { m |
-    <div class="msgDiv oldmsg dump $if(m.favorited)$favorite$endif$ $if(m.is_image)$contains-image$endif$" id="message-$m.message_id$" nick="$m.nick$">
+    <div class="msgDiv oldmsg dump$if(m.favorited)$favorite$endif$ $if(m.is_image)$contains-image$endif$ nick_$m.nick$" id="message-$m.message_id$" nick="$m.nick$">
       <span class="nick">
         <b><a href="$domain$/$m.nick$" target="_blank">$m.nick$</a></b>
         $if(m.favorited)$
@@ -41,6 +46,7 @@ $if(user_nick)$
     <input id="webcam-button-upload" value="Webcam" type="submit"type="button">
     <input id="webcam-button-snap" value="Send Pic" type="submit"type="button" class="invisible blink">  
     <button id="palette-button"></button>
+    <button id="manual-palette-button"></button>
   </div>
   <div id="effects-msg" class="invisible">click on your face for effects!</div>
 </div>
@@ -58,3 +64,18 @@ $else$
 $endif$
 </div>
 </div>
+
+  <div id="manual-palette">
+    <div id="manual-palette-thumbs">
+      <div id="manual-palette-localstorage-error" class="error">
+        Unfortunately you can't use this manual fav palette because your browser doesn't support localStorage D:
+      </div>
+      <div id="manual-palette-thumbs-empty" class="error">
+        This is the <a href='http://dump.fm/images/20120711/1341984961267-dumpfm-ohgod-boring_name.png'>manual fav palette</a>.
+        You can add and remove images from here manually by pasting the url below to keep them around forever! ALSO IT MIGHT BREAK.
+      </div>
+    </div>
+    <input id='manual-add-url-txt' type='text'>
+    <button id='manual-add-button'>Add</button>
+    <button id='manual-remove-button'>Rmv</button>
+  </div>
diff --git a/template/mutes.st b/template/mutes.st
index d8d9e96..4bf07bc 100644
--- a/template/mutes.st
+++ b/template/mutes.st
@@ -6,7 +6,7 @@
             type="text/javascript"></script>
     <script src="/static/js/jquery.tablesorter.min.js"
             type="text/javascript"></script>
-    <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/ui-lightness/jquery-ui.css" 
+    <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/ui-lightness/jquery-ui.css">
             
     <script src="/static/js/admin.js" type="text/javascript"></script>
     <link rel="stylesheet" type="text/css" href="/static/tsort/style.css">
diff --git a/template/privacy.st b/template/privacy.st
deleted file mode 100644
index 0bd8191..0000000
--- a/template/privacy.st
+++ /dev/null
@@ -1,70 +0,0 @@
-<html>
-  <head>
-      <link href="/static/css/pages.css" rel="stylesheet" type="text/css" media="screen"/>
-           <link href="/static/css/header.css" rel="stylesheet" type="text/css" media="screen"/> 
-           <script type="text/javascript" src="/static/js/win.js"></script> 
- <script type="text/javascript" src="/static/jquery.em.js"></script> 
-
-            <script type="text/javascript">
-			
-jQuery(function()
-{
-	jQuery('.scroll-pane').jScrollPane();
-});	
-			
-			
- </script>
-
-    <title>dump.fm</title>
-    $head()$
-  </head>
-  <body style="	font-family: Arial, Helvetica, sans-serif;
-	background-color:#f0f9ff;
-	background-image:url(/static/img/fade-blue.png)!important;
-	background-repeat:repeat-x;	
-	background-position:top;
-background-attachment:fixed;" onload="    
-             javascript:CreateDropdownWindow('dump.fm', '360px', true, 'news', 20, 115);
-                javascript:CreateDropdownWindow('privacy agreement', '560px', true, 'archive', 420, 60); 
-         
-              
-                
-                ">
-    $banner()$
-
-        
-    
-        
-    <div style="overflow:hidden; height:600px; position:absolute;display:none;" id="news">
-    	<div style="padding:0px;" id="content" name="content"> <div style="background-color:#fff"><center>
-<img src="/static/img/dumpclouds.png"><br><br>
-<h5>
-&#169;2010 All Rights Reserved<br><br>
-<a href="mailto:info@dump.fm"> info@dump.fm</a>
-</center><br></div></h5>
-    </div></div>
-    
-    <div style="display:none;"id="archive">
-	<div style="padding:0px" id="content" name="content"> 
-
-
-    <iframe src="/static/html/privacy.html" style="overflow-x:hidden; padding:5;background-image:url(/static/img/hearts.gif);background-repeat:repeat;" width="550px" height="500px"></iframe>
-    </div>
-        </div> 
-    <div style="display:none;"id="link">
-	<div id="content" name="content"> 
-
-
-    </div>
-    </div>
-
-    </div>
-    </div>
-    </div>
-<div id="hugescreen"><img src="/static/hugescreen.png"></div>
-  
-          <div id="footerc">
-	  $footer()$
-	</div>
-  </body>
-</html>
diff --git a/template/profile.st b/template/profile.st
index f37aeba..120a472 100644
--- a/template/profile.st
+++ b/template/profile.st
@@ -4,6 +4,12 @@
     <meta property="og:image" content="$avatar$"/>
     <meta property="og:title" content="$nick$'s dump.fm"/>
     <meta property="og:site_name" content="dump.fm"/>
+    <meta property="og:type" content="website" />
+    <meta property="og:url" content="http://dump.fm/$nick$"/>
+    <meta property="og:description" content=""/>
+    <meta property="fb:admins" content="34601449,100001923956223" />
+    <meta property="fb:app_id" content="119457341519154" />
+
     $head()$
     <script src="/static/js/jquery.editinplace.1.0.1.packed.js" type="text/javascript"></script>
     <script src="/static/js/ajaxupload.js"></script>
diff --git a/template/rooms/VIP.st b/template/rooms/VIP.st
index 442b476..59e7406 100644
--- a/template/rooms/VIP.st
+++ b/template/rooms/VIP.st
@@ -141,7 +141,10 @@
       <h1>Welcome to the cool club</h1>
       <ul>
         <li><a href="$domain$/roomlist">Rooms</a></li>
+        <li><a href="$domain$/users">New Users</a></li>
         <li><a href="$domain$/mutes">Mutes</a></li>
+        <li><a href="http://dump.fm/static/super/">Registration</a></li>
+        <li><a href="http://temp.dump.fm/">Temp</a></li>
       </ul>
     </div>
   </body>
diff --git a/template/terms.st b/template/terms.st
deleted file mode 100644
index d37a28c..0000000
--- a/template/terms.st
+++ /dev/null
@@ -1,65 +0,0 @@
-<html>
-  <head>
-      <link href="/static/css/pages.css" rel="stylesheet" type="text/css" media="screen"/>
-           <link href="/static/css/header.css" rel="stylesheet" type="text/css" media="screen"/> 
-           <script type="text/javascript" src="/static/js/win.js"></script> 
-            <script type="text/javascript">
-			
-jQuery(function()
-{
-	jQuery('.scroll-pane').jScrollPane();
-});	
-			
-			
- </script>
-
-    <title>dump.fm</title>
-    $head()$
-  </head>
-  <body style="	font-family: Arial, Helvetica, sans-serif;
-	background-color:#f0f9ff;
-	background-image:url(/static/img/fade-blue.png)!important;
-	background-repeat:repeat-x;	
-	background-position:top;
-background-attachment:fixed;" onload="    
-             javascript:CreateDropdownWindow('dump.fm', '360px', true, 'news', 20, 115);
-                javascript:CreateDropdownWindow('terms of service', '560px', true, 'archive', 420, 60); 
-         
-              
-                
-                ">
-    $banner()$
-
-        
-    
-        
-    <div style="overflow:hidden; height:600px; position:absolute;display:none;" id="news">
-    	<div style="padding:0px;" id="content" name="content"> <div style="background-color:#fff"><center>
-<img src="/static/img/dumpclouds.png"><br><br>
-<h5>
-&#169;2010 All Rights Reserved<br><br>
-<a href="mailto:info@dump.fm"> info@dump.fm</a>
-</center><br></div></h5>
-    </div></div>
-    
-    <div style="display:none;"id="archive">
-	<div style="padding:0px" id="content" name="content"> 
-
-
-    <iframe src="/static/html/terms.html" style="overflow-x:hidden; padding:5;background-image:url(/static/img/hearts.gif);background-repeat:repeat;" width="550px" height="500px"></iframe>
-    </div>
-        </div> 
-    <div style="display:none;"id="link">
-	
-    </div>
-
-    </div>
-    </div>
-    </div>
-<div id="hugescreen"><img src="/static/img/hugescreen.png"></div>
-  
-          <div id="footerc">
-	  $footer()$
-	</div>
-  </body>
-</html>
author	dumpfmprod <dumpfmprod@ubuntu.(none)>	2012-07-17 21:40:57 -0400
committer	dumpfmprod <dumpfmprod@ubuntu.(none)>	2012-07-17 21:40:57 -0400
commit	da15cfb1e452a0af4902272ba351d5a6d0d0b56a (patch)
tree	8525e56790625ab7b67e4c534fdf1739d0f592b6 /template
parent	38091d8e194aa48f6bd64e2cf8ccba6fd27c36a2 (diff)