weaver 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e3f5e93e0c7a9abe3b7a6af99483b5de90af586
-  data.tar.gz: 5be606f5cd5483f06f1de7ceddcfcba6644d09ef
+  metadata.gz: b5253d8bb1fcbc5aaf1810d3dcbfd9189cb6219c
+  data.tar.gz: ccf4de6c8995d1fb0bdd9f53b46658b5d308d872
 SHA512:
-  metadata.gz: 530d463409981279ca52f86b3d843caacca66cee4002e68254ec21abbe885cfdb5c459d62d787aad3c206c31025419c828f6968919983cf3b4efd7d99df3ed47
-  data.tar.gz: 07b1f354d816ac6a69a5629633b0313adaf602f2b6677c7766ad69b5f3992f3ac9730b5c78f56ceb8a7117cec959de39418c462790f8b1d7f25138097df12ace
+  metadata.gz: 6e798de127630dd28c00df60c4728f0716a84e38e7495898f49cbb02afec76240aa121326a7b77cb121c158706490c17379af6f4f456b5c9388dabf89396c0fc
+  data.tar.gz: 5099c7aec76e95dc91eaf31b5fcd4e904f3bea8a6ec67a8454ec42bb5ac873ccc106a487fb95c5a64bb93df44ea6730626c5acc46ef0a852d4eb085d35a9b2e5

data/lib/weaver/version.rb

@@ -1,3 +1,3 @@
 module Weaver
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/weaver.rb

@@ -64,7 +64,16 @@ module Weaver
         end
 
         def image(name, options={})
-        	img class: "img-responsive #{options[:class]}", src: "/images/#{name}"
+
+        	style = ""
+        	if options[:rounded_corners] == true
+        		style += " border-radius: 8px"
+        	else
+        		style += " border-radius: #{options[:rounded_corners]}px"
+
+        	end
+
+        	img class: "img-responsive #{options[:class]}", src: "/images/#{name}", style: style
         end
 
         def crossfade_image(image_normal, image_hover)
@@ -137,8 +146,27 @@ module Weaver
 ENDROW
 		end
 
-		def jumbotron(&block)
-			div :class => "jumbotron", &block
+		def jumbotron(options={}, &block)
+
+			additional_style = ""
+
+			if options[:background]
+				additional_style += " background-image: url('/images/#{options[:background]}'); background-position: center center; background-size: cover;"
+			end
+
+			if options[:height]
+				additional_style += " height: #{options[:height]}px;"
+			end
+
+			if options[:min_height]
+				additional_style += " min-height: #{options[:min_height]}px;"
+			end
+
+			if options[:max_height]
+				additional_style += " max-height: #{options[:max_height]}px;"
+			end
+
+			div :class => "jumbotron", style: additional_style, &block
 		end
 
 		def _button(options={})
@@ -771,6 +799,11 @@ ENDROW
 			row(class: "wrapper border-bottom white-bg page-heading", &block)
 		end
 
+		def brand(text, link="/")
+			@brand = text
+			@brand_link = link
+		end
+
 		def row(options={}, &block)
 			r = Row.new(@anchors, options)
 			r.instance_eval(&block)
@@ -832,6 +865,17 @@ ENDROW
 
 			end
 
+			brand_content = "" 
+
+			if @brand
+				brand_content = <<-BRAND_CONTENT
+
+	                <li>
+	                    <a href="#"><i class="fa fa-home"></i> <span class="nav-label">X</span> <span class="label label-primary pull-right"></span></a>
+	                </li>
+				BRAND_CONTENT
+			end
+
 			@loading_bar_visible = true
 			@content =
 			<<-ENDBODY
@@ -841,11 +885,9 @@ ENDROW
 			<div class="sidebar-collapse">
 				<ul class="nav" id="side-menu">
 
-	                <li>
-	                    <a href="#"><i class="fa fa-home"></i> <span class="nav-label">X</span> <span class="label label-primary pull-right"></span></a>
-	                </li>
+#{brand_content}
+#{navigation.generate}
 
-		            #{navigation.generate}
 				</ul>
 			</div>
 		</nav>
@@ -875,13 +917,15 @@ ENDROW
 			super
 		end
 
-		def nav(&block)
-		end
-
 		def header(&block)
 			row(class: "wrapper border-bottom white-bg page-heading", &block)
 		end
 
+		def brand(text, link="/")
+			@brand = text
+			@brand_link = link
+		end
+
 		def row(options={}, &block)
 			r = Row.new(@anchors, options)
 			r.instance_eval(&block)
@@ -938,7 +982,7 @@ ENDROW
                 				end
                     		end
 						elsif
-							a href: "#" do
+							a href: "#{item[:link]}" do
 								span :class => "nav-label" do
 									icon item[:icon]
 									text item[:name]
@@ -950,6 +994,18 @@ ENDROW
 
 			end
 
+			brand_content = "" 
+
+			if @brand
+				brand_content = <<-BRAND_CONTENT
+
+				    <div class="navbar-header">
+
+						<a href="#" class="navbar-brand">X</a>
+		            </div>
+				BRAND_CONTENT
+			end
+
 			@content =
 			<<-ENDBODY
 	<div id="wrapper">
@@ -958,12 +1014,11 @@ ENDROW
 	        <div class="row border-bottom white-bg">
 
 				<nav class="navbar navbar-static-top" role="navigation">
-				    <div class="navbar-header">
-		                <button aria-controls="navbar" aria-expanded="false" data-target="#navbar" data-toggle="collapse" class="navbar-toggle collapsed" type="button">
-		                    <i class="fa fa-reorder"></i>
-		                </button>
-						<a href="#" class="navbar-brand">X</a>
-		            </div>
+	                <button aria-controls="navbar" aria-expanded="false" data-target="#navbar" data-toggle="collapse" class="navbar-toggle collapsed" type="button">
+	                    <i class="fa fa-reorder"></i>
+	                </button>
+#{brand_content}
+
 		            <div class="navbar-collapse collapse" id="navbar">
 		                <ul class="nav navbar-nav">
 #{navigation.generate}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weaver
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - David Siaw
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-07 00:00:00.000000000 Z
+date: 2015-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra