diff --git a/app/assets/.DS_Store b/app/assets/.DS_Store index 689329d..4dd31ef 100644 Binary files a/app/assets/.DS_Store and b/app/assets/.DS_Store differ diff --git a/app/assets/images/.DS_Store b/app/assets/images/.DS_Store index 772a848..136a0a0 100644 Binary files a/app/assets/images/.DS_Store and b/app/assets/images/.DS_Store differ diff --git a/app/assets/images/1.jpg b/app/assets/images/1.jpg new file mode 100644 index 0000000..7926830 Binary files /dev/null and b/app/assets/images/1.jpg differ diff --git a/app/assets/images/2.jpg b/app/assets/images/2.jpg new file mode 100644 index 0000000..ed60c05 Binary files /dev/null and b/app/assets/images/2.jpg differ diff --git a/app/assets/images/3.jpg b/app/assets/images/3.jpg new file mode 100644 index 0000000..d852848 Binary files /dev/null and b/app/assets/images/3.jpg differ diff --git a/app/assets/images/4.jpg b/app/assets/images/4.jpg new file mode 100644 index 0000000..1a1a2c6 Binary files /dev/null and b/app/assets/images/4.jpg differ diff --git a/app/assets/images/alpha.png b/app/assets/images/alpha.png new file mode 100644 index 0000000..38043f1 Binary files /dev/null and b/app/assets/images/alpha.png differ diff --git a/app/assets/images/blackforest.png b/app/assets/images/blackforest.png new file mode 100644 index 0000000..6a8ddc2 Binary files /dev/null and b/app/assets/images/blackforest.png differ diff --git a/app/assets/images/clear.png b/app/assets/images/clear.png new file mode 100644 index 0000000..580b52a Binary files /dev/null and b/app/assets/images/clear.png differ diff --git a/app/assets/images/company.png b/app/assets/images/company.png new file mode 100644 index 0000000..0ce67d8 Binary files /dev/null and b/app/assets/images/company.png differ diff --git a/app/assets/images/email.png b/app/assets/images/email.png new file mode 100644 index 0000000..e74af67 Binary files /dev/null and b/app/assets/images/email.png differ diff --git a/app/assets/images/glyphicons-halflings-white.png b/app/assets/images/glyphicons-halflings-white.png new file mode 100644 index 0000000..3bf6484 Binary files /dev/null and b/app/assets/images/glyphicons-halflings-white.png differ diff --git a/app/assets/images/glyphicons-halflings.png b/app/assets/images/glyphicons-halflings.png new file mode 100644 index 0000000..11313fa Binary files /dev/null and b/app/assets/images/glyphicons-halflings.png differ diff --git a/app/assets/images/html-screen.jpg b/app/assets/images/html-screen.jpg new file mode 100644 index 0000000..210c8b4 Binary files /dev/null and b/app/assets/images/html-screen.jpg differ diff --git a/app/assets/images/hue.png b/app/assets/images/hue.png new file mode 100644 index 0000000..d89560e Binary files /dev/null and b/app/assets/images/hue.png differ diff --git a/app/assets/images/key.png b/app/assets/images/key.png new file mode 100644 index 0000000..20dba07 Binary files /dev/null and b/app/assets/images/key.png differ diff --git a/app/assets/images/loading-black.gif b/app/assets/images/loading-black.gif new file mode 100644 index 0000000..2539121 Binary files /dev/null and b/app/assets/images/loading-black.gif differ diff --git a/app/assets/images/loading-blue.gif b/app/assets/images/loading-blue.gif new file mode 100644 index 0000000..fa1760f Binary files /dev/null and b/app/assets/images/loading-blue.gif differ diff --git a/app/assets/images/loading-green.gif b/app/assets/images/loading-green.gif new file mode 100644 index 0000000..3ef707c Binary files /dev/null and b/app/assets/images/loading-green.gif differ diff --git a/app/assets/images/loading-orange.gif b/app/assets/images/loading-orange.gif new file mode 100644 index 0000000..215b29c Binary files /dev/null and b/app/assets/images/loading-orange.gif differ diff --git a/app/assets/images/loading-red.gif b/app/assets/images/loading-red.gif new file mode 100644 index 0000000..5d348e3 Binary files /dev/null and b/app/assets/images/loading-red.gif differ diff --git a/app/assets/images/loading.gif b/app/assets/images/loading.gif new file mode 100644 index 0000000..5b33f7e Binary files /dev/null and b/app/assets/images/loading.gif differ diff --git a/app/assets/images/logo-blue.png b/app/assets/images/logo-blue.png new file mode 100644 index 0000000..6f53e9d Binary files /dev/null and b/app/assets/images/logo-blue.png differ diff --git a/app/assets/images/logo.png b/app/assets/images/logo.png new file mode 100644 index 0000000..1ebf28d Binary files /dev/null and b/app/assets/images/logo.png differ diff --git a/app/assets/images/logo.psd b/app/assets/images/logo.psd new file mode 100644 index 0000000..618c3ae Binary files /dev/null and b/app/assets/images/logo.psd differ diff --git a/app/assets/images/logo1.png b/app/assets/images/logo1.png new file mode 100644 index 0000000..8f06c09 Binary files /dev/null and b/app/assets/images/logo1.png differ diff --git a/app/assets/images/logo2.png b/app/assets/images/logo2.png new file mode 100644 index 0000000..af86f1b Binary files /dev/null and b/app/assets/images/logo2.png differ diff --git a/app/assets/images/logo3.png b/app/assets/images/logo3.png new file mode 100644 index 0000000..bac7ed2 Binary files /dev/null and b/app/assets/images/logo3.png differ diff --git a/app/assets/images/profile.jpg b/app/assets/images/profile.jpg new file mode 100644 index 0000000..ec566fa Binary files /dev/null and b/app/assets/images/profile.jpg differ diff --git a/app/assets/images/profile.png b/app/assets/images/profile.png new file mode 100644 index 0000000..744197a Binary files /dev/null and b/app/assets/images/profile.png differ diff --git a/app/assets/images/profile1.png b/app/assets/images/profile1.png new file mode 100644 index 0000000..2df835e Binary files /dev/null and b/app/assets/images/profile1.png differ diff --git a/app/assets/images/rails.png b/app/assets/images/rails.png deleted file mode 100644 index d5edc04..0000000 Binary files a/app/assets/images/rails.png and /dev/null differ diff --git a/app/assets/images/saturation.png b/app/assets/images/saturation.png new file mode 100644 index 0000000..594ae50 Binary files /dev/null and b/app/assets/images/saturation.png differ diff --git a/app/assets/images/select2.png b/app/assets/images/select2.png new file mode 100644 index 0000000..28982f2 Binary files /dev/null and b/app/assets/images/select2.png differ diff --git a/app/assets/images/social_icons.png b/app/assets/images/social_icons.png new file mode 100644 index 0000000..4dc28bf Binary files /dev/null and b/app/assets/images/social_icons.png differ diff --git a/app/assets/images/sorting.png b/app/assets/images/sorting.png new file mode 100644 index 0000000..b88c06c Binary files /dev/null and b/app/assets/images/sorting.png differ diff --git a/app/assets/images/sorting_asc.png b/app/assets/images/sorting_asc.png new file mode 100644 index 0000000..c0d72a3 Binary files /dev/null and b/app/assets/images/sorting_asc.png differ diff --git a/app/assets/images/sorting_desc.png b/app/assets/images/sorting_desc.png new file mode 100644 index 0000000..f580b85 Binary files /dev/null and b/app/assets/images/sorting_desc.png differ diff --git a/app/assets/images/ui-icons_3d80b3_256x240.png b/app/assets/images/ui-icons_3d80b3_256x240.png new file mode 100644 index 0000000..4f624bb Binary files /dev/null and b/app/assets/images/ui-icons_3d80b3_256x240.png differ diff --git a/app/assets/stylesheets/main.css b/app/assets/stylesheets/main.css index a14e643..3334914 100644 --- a/app/assets/stylesheets/main.css +++ b/app/assets/stylesheets/main.css @@ -1967,31 +1967,31 @@ button.btn.btn-mini, input[type="submit"].btn.btn-mini { *margin-right: .3em; line-height: 14px; vertical-align: text-top; - background-image: url("../img/glyphicons-halflings.png"); + background-image: url("../assets/glyphicons-halflings.png"); background-position: 14px 14px; background-repeat: no-repeat; margin-top: 1px; } /* White icons with optional class, or on hover/active states of certain elements */ .icon-white { - background-image: url("../img/glyphicons-halflings-white.png"); } + background-image: url("../assets/glyphicons-halflings-white.png"); } .nav-pills > .active > a > [class^="icon-"], .nav-pills > .active > a > [class*=" icon-"] { - background-image: url("../img/glyphicons-halflings-white.png"); } + background-image: url("../assets/glyphicons-halflings-white.png"); } .nav-list > .active > a > [class^="icon-"], .nav-list > .active > a > [class*=" icon-"] { - background-image: url("../img/glyphicons-halflings-white.png"); } + background-image: url("../assets/glyphicons-halflings-white.png"); } .navbar-inverse .nav > .active > a > [class^="icon-"], .navbar-inverse .nav > .active > a > [class*=" icon-"] { - background-image: url("../img/glyphicons-halflings-white.png"); } + background-image: url("../assets/glyphicons-halflings-white.png"); } .dropdown-menu > li > a:hover > [class^="icon-"], .dropdown-menu > li > a:hover > [class*=" icon-"] { - background-image: url("../img/glyphicons-halflings-white.png"); } + background-image: url("../assets/glyphicons-halflings-white.png"); } .dropdown-menu > .active > a > [class^="icon-"], .dropdown-menu > .active > a > [class*=" icon-"] { - background-image: url("../img/glyphicons-halflings-white.png"); } + background-image: url("../assets/glyphicons-halflings-white.png"); } .dropdown-submenu:hover > a > [class^="icon-"], .dropdown-submenu:hover > a > [class*=" icon-"] { - background-image: url("../img/glyphicons-halflings-white.png"); } + background-image: url("../assets/glyphicons-halflings-white.png"); } .icon-glass { background-position: 0 0; } @@ -4717,7 +4717,7 @@ button.close { display: none; } .modal-loading .modal-image { - background: url(../img/loading-orange.gif) center no-repeat; } + background: url(../assets/loading-orange.gif) center no-repeat; } .modal-gallery.fade .modal-image { -webkit-transition: width 0.15s ease, height 0.15s ease; @@ -4791,7 +4791,7 @@ button.close { height: 40px; margin: 0 2px; outline: none; - background: transparent url(../img/social_icons.png) no-repeat top left; + background: transparent url(../assets/social_icons.png) no-repeat top left; text-indent: -9000px; position: relative; } .fancy-tooltip-wrapper li .tooltip-facebook, .fancy-tooltip-wrapper1 li .tooltip-facebook { @@ -5046,7 +5046,7 @@ button.close { .colorpicker-saturation { width: 100px; height: 100px; - background-image: url(../img/saturation.png); + background-image: url(../assets/saturation.png); cursor: crosshair; float: left; } .colorpicker-saturation i { @@ -5090,10 +5090,10 @@ button.close { margin-top: -1px; } .colorpicker-hue { - background-image: url(../img/hue.png); } + background-image: url(../assets/hue.png); } .colorpicker-alpha { - background-image: url(../img/alpha.png); + background-image: url(../assets/alpha.png); display: none; } .colorpicker { @@ -5119,7 +5119,7 @@ button.close { height: 10px; margin-top: 5px; clear: both; - background-image: url(../img/alpha.png); + background-image: url(../assets/alpha.png); background-position: 0 100%; } .colorpicker-color div { height: 10px; } @@ -6117,13 +6117,13 @@ header { background: #f9f9f9; } #dt_example .dataTable .sorting { cursor: pointer; - background: url(../img/sorting.png) no-repeat center right; } + background: url(../assets/sorting.png) no-repeat center right; } #dt_example .dataTable .sorting_asc { cursor: pointer; - background: url(../img/sorting_asc.png) no-repeat center right; } + background: url(../assets/sorting_asc.png) no-repeat center right; } #dt_example .dataTable .sorting_desc { cursor: pointer; - background: url(../img/sorting_desc.png) no-repeat center right; } + background: url(../assets/sorting_desc.png) no-repeat center right; } /* Progress UI */ .progress-statistics li { diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 229c479..fa9e692 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,7 +1,7 @@ - Railsgoat + RailsGoat <%= stylesheet_link_tag "application", :media => "all" %> <%= javascript_include_tag "application" %> <%= csrf_meta_tags %> @@ -19,6 +19,9 @@ <%= render "layouts/shared/header" %> <%= render "layouts/shared/sidebar" %> +
<%= yield %> +
+<%= render "layouts/shared/footer" %> diff --git a/app/views/layouts/shared/_footer.html.erb b/app/views/layouts/shared/_footer.html.erb new file mode 100644 index 0000000..3c23acb --- /dev/null +++ b/app/views/layouts/shared/_footer.html.erb @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/app/views/layouts/shared/_header.html.erb b/app/views/layouts/shared/_header.html.erb index 7cb2e86..7df2af0 100644 --- a/app/views/layouts/shared/_header.html.erb +++ b/app/views/layouts/shared/_header.html.erb @@ -1,5 +1,5 @@
-
@@ -51,4 +51,4 @@ -
\ No newline at end of file + \ No newline at end of file diff --git a/app/views/layouts/shared/_sidebar.html.erb b/app/views/layouts/shared/_sidebar.html.erb index e893baf..f0ed6b0 100644 --- a/app/views/layouts/shared/_sidebar.html.erb +++ b/app/views/layouts/shared/_sidebar.html.erb @@ -100,7 +100,7 @@