fixed merge confilcts in pad.html

static/custom/.gitignore

@@ -0,0 +1,3 @@
+*
+!js.template
+!css.template

static/custom/css.template

@@ -0,0 +1,5 @@
+/*
+  You may have to use !important to override css attributs, for example:
+  
+  * {color: blue !important;}
+*/

static/custom/js.template

@@ -0,0 +1,6 @@
+function costumStart()
+{
+  //define your javascript here
+  //jquery is avaiable - except index.js
+  //you can load extra scripts with $.getScript http://api.jquery.com/jQuery.getScript/
+}

static/index.html

@@ -81,11 +81,13 @@
              width: 40px;
             }
         </style> 
+        <link href="static/custom/index.css" rel="stylesheet">
+        <script src="static/custom/index.js"></script>
         <div id="container"> 
             <div id="button" onclick="go2Random()">New Pad</div> 
             <br> 
             <div class="label">or create/open a Pad with the name</div>
-            <form action="" onsubmit="go2Name();return false;"> 
+            <form action="#" onsubmit="go2Name();return false;"> 
                     <input type="text" id="padname" autofocus> 
                     <input type="submit" value="OK"> 
             </form> 
@@ -111,7 +113,7 @@
  
             function randomPadName() 
             {
-                var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
+                var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
                 var string_length = 10;
                 var randomstring = '';
                 for (var i = 0; i < string_length; i++) 
@@ -121,5 +123,8 @@
                 }
                 return randomstring;
             }
+            
+            //start the costum js
+            if(costumStart) costumStart();
         </script>
-</html>
+</html>

static/js/cssmanager.js

@@ -20,7 +20,7 @@ function makeCSSManager(emptyStylesheetTitle, top)
   function getSheetByTitle(title, top)
   {
     if(top)
-      var allSheets = window.top.document.styleSheets;
+      var allSheets = window.parent.parent.document.styleSheets;
     else 
       var allSheets = document.styleSheets;
     

static/js/pad2.js

@@ -29,6 +29,9 @@ $(document).ready(function()
     document.location = expectedURL;
   }
 
+  //start the costum js
+  if(costumStart) costumStart();
+
   handshake();
 });
 
@@ -64,7 +67,7 @@ function readCookie(name)
 
 function randomString()
 {
-  var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
+  var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
   var string_length = 20;
   var randomstring = '';
   for (var i = 0; i < string_length; i++)
@@ -126,8 +129,8 @@ function handshake()
       receivedClientVars = true;
 
       clientVars = obj;
-      clientVars.userAgent = navigator.userAgent;
-      clientVars.collab_client_vars.clientAgent = navigator.userAgent;
+      clientVars.userAgent = "Anonymous";
+      clientVars.collab_client_vars.clientAgent = "Anonymous";
 
       pad.init();
 

static/js/pad_editbar.js

@@ -101,13 +101,13 @@ var padeditbar = (function()
         else if (cmd == 'embed')
         {  
           var padurl = document.location;
-          $('#embedinput').val("<iframe src='" + padurl + "' width=500 height=400>");
+          $('#embedinput').val("<iframe src='" + padurl + "' width=600 height=400>");
           self.toogleDropDown("embed");
           $('#embedinput').focus().select();
         }
         else if (cmd == 'import_export')
         {
-	  self.toogleDropDown("importexport");
+	      self.toogleDropDown("importexport");
         }
 
         else if (cmd == 'readonly')

static/js/pad_impexp.js

@@ -233,12 +233,26 @@ var padimpexp = (function()
       // build the export links
       $("#exporthtmla").attr("href", document.location.href + "/export/html");
       $("#exportplaina").attr("href", document.location.href + "/export/txt");
-      $("#exportworda").attr("href", document.location.href + "/export/doc");
-      $("#exportpdfa").attr("href", document.location.href + "/export/pdf");
-      $("#exportopena").attr("href", document.location.href + "/export/odt");
       $("#exportwordlea").attr("href", document.location.href + "/export/wordle");
-    
-      $("#importform").get(0).setAttribute('action', document.location.href + "/import"); 
+      
+      //hide stuff thats not avaible if abiword is disabled
+      if(!clientVars.abiwordAvailable)
+      {
+        $("#exportworda").remove();
+        $("#exportpdfa").remove();
+        $("#exportopena").remove();
+        $("#importexport").css({"height":"95px"});
+        $("#importexportline").css({"height":"95px"});
+        $("#import").html("Import is not available");
+      }
+      else
+      {
+        $("#exportworda").attr("href", document.location.href + "/export/doc");
+        $("#exportpdfa").attr("href", document.location.href + "/export/pdf");
+        $("#exportopena").attr("href", document.location.href + "/export/odt");
+        
+        $("#importform").get(0).setAttribute('action', document.location.href + "/import"); 
+      }
     
       $("#impexp-close").click(function()
       {
@@ -275,9 +289,7 @@ var padimpexp = (function()
     },
     export2Wordle: function()
     {
-      padUrl = location.pathname;
-      padHost = location.host;
-      var padUrl = "http://" + padHost +  padUrl + "/export/txt";
+      var padUrl = document.location.href + "/export/txt";
       
       $.get(padUrl, function(data) 
       {

static/pad.html

@@ -13,6 +13,8 @@
   </script>
   <script src="../socket.io/socket.io.js"></script>
   <script src="../minified/pad.js"></script>
+  <link href="../static/custom/pad.css" rel="stylesheet">
+  <script src="../static/custom/pad.js"></script>
   <style type="text/css" title="dynamicsyntax"></style>
 </head>
 
@@ -79,17 +81,17 @@
 <ul id="menu_right">
 
 <li>
-  <a onClick="window.pad&&pad.editbarClick('readonly');return false;" title="Create a readonly link for this pad">
+  <a id="readonlylink" onClick="window.pad&&pad.editbarClick('readonly');return false;" title="Create a readonly link for this pad">
      <div class="buttonicon" style="background-position:0px -150px"></div>
   </a>
 </li>
 <li>
-  <a onClick="window.pad&&pad.editbarClick('import_export');return false;" title="Import/Export from/to different document formats">
+  <a id="exportlink" onClick="window.pad&&pad.editbarClick('import_export');return false;" title="Import/Export from/to different document formats">
     <div class="buttonicon" style="background-position:0px -68px"></div>
   </a>
 </li>
 <li>
-  <a onClick="window.pad&&pad.editbarClick('embed');return false;" title="Embed this pad">
+  <a id="embedlink" onClick="window.pad&&pad.editbarClick('embed');return false;" title="Embed this pad">
     <div class="buttonicon" style="background-position:0px -18px"></div>
   </a>
 </li>
@@ -219,7 +221,7 @@ We removed this feature cause its not worth the space it needs in the editbar
   <a id="exportworda" target="_blank" class="exportlink"><div class="exporttype" id="exportword">Microsoft Word</div></a>
   <a id="exportpdfa" target="_blank" class="exportlink"><div class="exporttype" id="exportpdf">PDF</div></a>
   <a id="exportopena" target="_blank" class="exportlink"><div class="exporttype" id="exportopen">OpenDocument</div></a>
-  <a id="exportwordlea" target="_blank" onClick="loadCont();return false;" class="exportlink"><div class="exporttype" id="exportwordle">Wordle</div></a>
+  <a id="exportwordlea" target="_blank" onClick="padimpexp.export2Wordle();return false;" class="exportlink"><div class="exporttype" id="exportwordle">Wordle</div></a>
   <form id="wordlepost" name="wall" action="http://wordle.net/advanced" method="POST" style="margin-left:0px;"> 
     <div id="hidetext" style=""><textarea id="text" name="text" id="text" style="display:none;">Coming soon!</textarea></div> 
   </form> 

static/timeslider.html

@@ -8,7 +8,13 @@
   <link rel="stylesheet" href="../../static/css/pad.css">
   <link rel="stylesheet" href="../../static/css/timeslider.css">
   <style type="text/css" title="dynamicsyntax"></style>
-  <script src="../../static/js/jquery.min.js"></script>
+  
+  <script type="text/javascript" src="../../socket.io/socket.io.js"></script>
+  <script type="text/javascript" src="../../minified/timeslider.js"></script>
+  
+  <link href="../../static/custom/timeslider.css" rel="stylesheet">
+  <script src="../../static/custom/timeslider.js"></script>
+  
   <script>
 // <![CDATA[
   var clientVars = {};
@@ -37,7 +43,7 @@
   }
 
   function randomString() {
-	  var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
+	  var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
 	  var string_length = 20;
 	  var randomstring = '';
 	  for (var i=0; i<string_length; i++) {
@@ -49,8 +55,11 @@
 
   var socket, token, padId;
 
-  $(window).load(function () 
+  $(document).ready(function () 
   {
+    //start the costum js
+    if(costumStart) costumStart();
+    
     //get the padId out of the url 
     var urlParts= document.location.pathname.split("/");
     padId = urlParts[urlParts.length-2];
@@ -133,26 +142,6 @@
 
   // ]]>
   </script>
-  <script type="text/javascript" src="../../static/js/plugins.js"></script>
-  <script type="text/javascript" src="../../static/js/undo-xpopup.js"></script>
-  <script type="text/javascript" src="../../socket.io/socket.io.js"></script>
-  <script type="text/javascript" src="../../static/js/json2.js"></script>
-  <script type="text/javascript" src="../../static/js/colorutils.js"></script>
-  <script type="text/javascript" src="../../static/js/draggable.js"></script>
-  <script type="text/javascript" src="../../static/js/pad_utils.js"></script>
-  <script type="text/javascript" src="../../static/js/pad_cookie.js"></script>
-  <script type="text/javascript" src="../../static/js/pad_editor.js"></script>
-  <script type="text/javascript" src="../../static/js/pad_editbar.js"></script>
-  <script type="text/javascript" src="../../static/js/pad_docbar.js"></script>
-  <script type="text/javascript" src="../../static/js/pad_modals.js"></script>
-  <script type="text/javascript" src="../../static/js/easysync2_client.js"></script>
-  <script type="text/javascript" src="../../static/js/domline_client.js"></script>
-  <script type="text/javascript" src="../../static/js/linestylefilter_client.js"></script>
-  <script type="text/javascript" src="../../static/js/cssmanager_client.js"></script>
-  <script type="text/javascript" src="../../static/js/broadcast.js"></script>
-  <script type="text/javascript" src="../../static/js/broadcast_slider.js"></script>
-  <script type="text/javascript" src="../../static/js/broadcast_revisions.js">
-</script>
 </head>
 
 <body id="padbody" class="timeslider limwidth nonpropad nonprouser">