Removed dead code.

fpunktk · Feb 24, 2013 · 87e17b3 · 87e17b3
1 parent 190b278
commit 87e17b3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 28 deletions.
diff --git a/css/zerobin.css b/css/zerobin.css
@@ -111,7 +111,7 @@ div#deletelink { float:right; }
 div#toolbar, div#status { margin-bottom:5px; }
 #copyhint { color: #666; font-size:8pt; }
 
-button,.button,div#expiration,div#language {
+button,.button,div#expiration {
 color:#fff;
 background-color:#323B47;
 background-repeat:no-repeat;
@@ -164,21 +164,21 @@ position:relative;
 top:2px;
 }
 
-div#expiration, div#language, div#burnafterreadingoption, div#opendisc, div#syntaxcoloringoption { 
+div#expiration, div#burnafterreadingoption, div#opendisc, div#syntaxcoloringoption { 
 background-color:#414D5A; 
 padding:6px 8px;
 margin:0px 5px 0px 0px;;
 position: relative;
 bottom:1px; /* WTF ? Why is this shifted by 1 pixel ? */
 }
-div#expiration select, div#language select {
+div#expiration select {
 color:#eee;
 background: transparent;
 border: none;
 }
 
 
-div#expiration select option, div#language select option {
+div#expiration select option {
 color:#eee;
 background: #414D5A;
 background-color:#414D5A;

diff --git a/js/zerobin.js b/js/zerobin.js
@@ -397,8 +397,6 @@ function stateNewPaste() {
     $('button#clonebutton').hide();
     $('div#expiration').show();
     $('div#remainingtime').hide();
-    $('div#language').hide(); // $('#language').show();
-    $('input#password').hide(); //$('#password').show();
     $('div#burnafterreadingoption').show();
     $('div#opendisc').show();
     $('div#syntaxcoloringoption').show();
@@ -426,8 +424,6 @@ function stateExistingPaste() {
     }
 
     $('div#expiration').hide();
-    $('div#language').hide();
-    $('input#password').hide();
     $('div#burnafterreadingoption').hide();
     $('div#opendisc').hide();
     $('div#syntaxcoloringoption').hide();    

diff --git a/tpl/page.html b/tpl/page.html
@@ -59,27 +59,18 @@ <h3>{$VERSION}</h3>
       </select>
       </div>
       <div id="remainingtime" style="display:none;"></div>
-      <div id="language" style="display:none;">
-      <select name="language">
-        <option value="language" selected="selected">Language</option>
-        <option value="C/C++">C/C++</option>
-        <option value="php">php</option>
-        <option value="python">Python</option>
-      </select>
+      <div id="burnafterreadingoption" class="button" style="display:none;">
+         <input type="checkbox" id="burnafterreading" name="burnafterreading" />
+         <label for="burnafterreading">Burn after reading</label>
+      </div>
+      <div id="opendisc" class="button" style="display:none;">
+         <input type="checkbox" id="opendiscussion" name="opendiscussion" />
+         <label for="opendiscussion">Open discussion</label>
+      </div>
+      <div id="syntaxcoloringoption" class="button" style="display:none;">
+         <input type="checkbox" id="syntaxcoloring" name="syntaxcoloring" />
+         <label for="syntaxcoloring">Syntax coloring</label>
       </div>
-        <div id="burnafterreadingoption" class="button" style="display:none;">
-           <input type="checkbox" id="burnafterreading" name="burnafterreading" />
-           <label for="burnafterreading">Burn after reading</label>
-        </div>
-        <input id="password" value="Optional password..." style="display:none;" />
-        <div id="opendisc" class="button" style="display:none;">
-           <input type="checkbox" id="opendiscussion" name="opendiscussion" />
-           <label for="opendiscussion">Open discussion</label>
-        </div>
-        <div id="syntaxcoloringoption" class="button" style="display:none;">
-           <input type="checkbox" id="syntaxcoloring" name="syntaxcoloring" />
-           <label for="syntaxcoloring">Syntax coloring</label>
-        </div>
     </div>
     <div id="pasteresult" style="display:none;">
       <div id="deletelink"></div>