tmin 0.1.8 → 0.1.9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tmin (0.1.7)
+    tmin (0.1.8)
       dm-aggregates (~> 1.2.0)
       dm-core (~> 1.2.0)
       dm-migrations (~> 1.2.0)

data/config.ru

@@ -8,7 +8,7 @@ app = Firefly::Server.new do
   set :hostname,    "tminus.it"
 
   # Used for authenticating you.
-  set :api_key,     "texas"wq
+  set :api_key,     "texas"
 
   # Use Sqlite3 by default
   set :database,    "sqlite3://#{Dir.pwd}/firefly.sqlite3"

data/lib/tmin/server.rb

@@ -175,9 +175,9 @@ module Firefly
       @urls = Firefly::Url.all(:limit => config[:recent_urls], :order => [ sort_column.to_sym.send(sort_order.to_sym) ] )
 
 
-      haml :admin
+      haml :admin, :layout => :admin_layout
     else
-      haml :index
+      haml :index, :layout => :admin_layout
     end
   end 
     

data/lib/tmin/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module Tminus
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/public/bootstrap.css

@@ -9,8 +9,7 @@
 
 .well {
     margin-top: 20px;
-    background-color: rgba(245, 245, 245, 0.6);
-}
+    background-color: rgba(0, 0, 0, 0.3);}
 
 
 .spacer {
@@ -20,18 +19,32 @@
 
 #bg {
     position: fixed;
+    top: -50%;
+    left: -50%;
+    width: 200%;
+    height: 200%;
+}
+#bg img {
+    position: absolute;
     top: 0;
     left: 0;
-
-    /* Preserve aspet ratio */
-    min-width: 100%;
-    min-height: 100%;
+    right: 0;
+    bottom: 0;
+    margin: auto;
+    min-width: 50%;
+    min-height: 50%;
 }
 
 h1{
-    font-size: 168px;
+    font-size: 123px;
+    color: white;
 }
 
 h2 {
     font-size: 68px;
+    color: white;
+}
+
+.white {
+    color: #FFF;
 }

data/views/admin.haml

@@ -7,11 +7,11 @@
     %p
       %a{ :href => "javascript:var%20d=document,w=window,enc=encodeURIComponent,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),s2=((s.toString()=='')?s:('%22'+enc(s)+'%22')),key=enc('#{@config[:api_key]}'),f='http://#{@config[:hostname]}/api/add',l=d.location,p='?visual=1&api_key='+key+'&url='+enc(l.href),u=f+p;try{if(!/^(.*\.)?tumblrzzz[^.]*$/.test(l.host))throw(0);tstbklt();}catch(z){a%20=function(){if(!w.open(u))l.href=u;};if(/Firefox/.test(navigator.userAgent))setTimeout(a,0);else%20a();}void(0)" } Shorten with #{@config[:hostname]}
     %br
-    %h2
+    %h3
       Total Events Created:
       = Firefly::Url.count
 
-  %h1 How about shortening a URL?
+  %h3 How about shortening a URL?
 
   .the_form
     %form{ :action => '/api/add', :method => 'post' }

data/views/layout.haml

@@ -23,14 +23,18 @@
 
 
 -unless @time[5].length < 10   == false
-  <img src="/images/#{@time[5]}-568h@2x.jpg" id="bg" alt="">
+  <div id="bg">
+  <img src="/images/#{@time[5]}-568h@2x.jpg" alt="">
+  </div>
   .container
     .row
       .col-sm-12
         .well.spacer
           = yield
 -unless @time[5].length > 10 == false
-  <img src="http://s3.amazonaws.com/medows/images/#{@time[5]}" id="bg" alt="">
+  <div id="bg">
+  <img src="http://s3.amazonaws.com/medows/images/#{@time[5]}"  alt="">
+  </div>
   .container
     .row
       .col-sm-12

data/views/redirect.haml

@@ -13,10 +13,10 @@
   %h2.text-center
     = URI.unescape(@time[8])
   %hr
-  %h3.lead
-    %strong Event Details:
-    Event Date: #{@time[4].gsub!('~',' ')}
-    Alarm: Yes
+  %h3.lead.white
+    %strong Countdown Details:
+    Date: #{@time[4].gsub!('~',' ')}
+    Alert: Yes
 
 
 
@@ -49,10 +49,10 @@
                           var minutes = Math.floor((distance % _hour) / _minute);
                           var seconds = Math.floor((distance % _minute) / _second);
 
-                          document.getElementById('countdown').innerHTML = days + 'days ';
-                          document.getElementById('countdown').innerHTML += hours + 'hrs ';
-                          document.getElementById('countdown').innerHTML += minutes + 'mins ';
-                          document.getElementById('countdown').innerHTML += seconds + 'secs';
+                          document.getElementById('countdown').innerHTML = days + ' Days <br> ';
+                          document.getElementById('countdown').innerHTML += hours + ' Hours <br>';
+                          document.getElementById('countdown').innerHTML += minutes + ' Minutes <br>';
+                          document.getElementById('countdown').innerHTML += seconds + ' Seconds';
 
                       }
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tmin
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - drobs