Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: thurtt/Flyerzero
base: b8db17bf48
...
head fork: thurtt/Flyerzero
compare: c730a09dc7
  • 2 commits
  • 5 files changed
  • 0 commit comments
  • 1 contributor
View
5 app/assets/javascripts/application.js
@@ -86,7 +86,10 @@ function loadFlyerData(lat, lng) {
if( uploadData.submit ){
uploadData.submit();
$('#message_text').html('');
- $('#message_content').fadeIn();
+ $('#create_wait').show();
+ $('#form_content').fadeOut(function(){
+ $('#message_content').fadeIn();
+ });
} else {
$('#dragdrop_text').addClass( 'error_text' );
$('#message_content').html('You need to select a flyer to create a new event.');
View
32 app/assets/stylesheets/events.css.scss
@@ -79,6 +79,7 @@ div#dragdrop_text {
box-shadow: 1px 1px 1px 1px #888;
}
+
.ui-menu-item{
padding: 5px;
border-bottom: 1px solid #cccccc;
@@ -95,22 +96,26 @@ div#dragdrop_text {
color: #444444;
padding-left: 15px;
}
+
.venue_name{
font-size: 1.1em;
color: black;
}
+
.ui-datepicker-prev{
float: left;
background-image: url('/assets/prev.png');
width: 16px;
height: 16px;
}
+
.ui-datepicker-next{
float: right;
background-image: url('/assets/next.png');
width: 16px;
height: 16px;
}
+
.ui-datepicker-header{
background: #f9e101;
padding-top: 5px;
@@ -134,8 +139,7 @@ div#dragdrop_text {
font-weight: 700;
}
-#create_wait{
- /*display: none;*/
+#message_content .textbox{
height: 70px;
margin-top: -35px;
top: 50%;
@@ -143,25 +147,18 @@ div#dragdrop_text {
text-align: center;
position: relative;
}
+
#message_content{
- position: absolute;
- top: 50%;
+ position: relative;
+ top: 40%;
margin-left: auto;
margin-right: auto;
- background: #f9f9f9;
- width: 300px;
+ width: 400px;
height: 200px;
- z-index: 10;
- border: 1px solid #aaaaaa;
margin-top: -100px;
- box-shadow: 0px 0px 5px 5px #aaaaaa;
- display: none;
-}
-#message_container{
- position:absolute;
- width:100%;
- left:0px;
+ display:none;
}
+
#venue_wait{
display: none;
width: 16px;
@@ -183,18 +180,22 @@ div#dragdrop_text {
#venue_icon{
float: left;
}
+
#venue_container{
float: left;
margin-left: 10px;
}
+
#venue_name{
font-size: 1.1em;
font-weight: 600;
}
+
#buttons {
text-align:center;
}
+
#buttons input{
border:1px solid #888;
padding:5px;
@@ -203,6 +204,7 @@ div#dragdrop_text {
font-size:1.2em;
margin: 5px;
}
+
#buttons input:hover{
border:1px solid #999;
background:#f5f5f5;
View
19 app/views/board/_flyers.html.erb
@@ -1,14 +1,19 @@
-
<div id="board_page">
<%= render :partial=>"flyer"%>
</div>
<div id="submission_page">
- <div style="width:990px; margin:0 auto;">
- <%=form_for( @event, :url=>{ :controller=>"events",:action=>"create" }, :remote=>"true") do |f| %>
- <div class="yellow_text" style="font-size:3.0em;">Submit your flyer.</div>
- <div id="dragdrop" class="container"><%= render :partial=>"events/dragdrop" %></div>
- <div id="submit" class="container"><%= render :partial=>"events/submit", :locals=>{ :f=>f } %></div>
- <%end%>
+ <div style="width:990px; margin:0 auto;height: 100%;" id="form_area">
+ <div class="yellow_text" style="font-size:3.0em;">Submit your flyer.</div>
+ <div id="form_content">
+ <%=form_for( @event, :url=>{ :controller=>"events",:action=>"create" }, :remote=>"true" ) do |f| %>
+ <div id="dragdrop" class="container"><%= render :partial=>"events/dragdrop" %></div>
+ <div id="submit" class="container"><%= render :partial=>"events/submit", :locals=>{ :f=>f } %></div>
+ <%end%>
+ </div>
+ <div id="message_content">
+ <div id="create_wait" class="textbox"><%= image_tag "cycle-medium.gif" %><br />Submitting your event, please wait...</div>
+ <div id="message_text" class="textbox"></div>
+ </div>
</div>
</div>
View
24 app/views/events/_create.js.erb
@@ -1,9 +1,17 @@
-$('#dragdrop').fadeOut( function(){
- $('#dragdrop').html( '<%= escape_javascript(render(:partial => "dragdrop")) %>' ).fadeIn();
- // gotta re-attach the file upload listener
- attachFileUploader();
- } );
+
+$('#dragdrop').html( '<%= escape_javascript(render(:partial => "dragdrop")) %>' );
+
+// gotta re-attach the file upload listener
+attachFileUploader();
+
clearForm();
-$('#create_wait').hide();
-$('#message_text').html('Event successfully created! Be sure to check your email and click on the activation link to activate your new event.');
-$('#message_content').delay(5000).fadeOut();
+
+$('#message_text').hide();
+$('#create_wait').fadeOut(function(){
+ $('#message_text').html('<%= raw("<h1>Event successfully created!</h1><p>Be sure to check your email and click on the activation link to activate your new event.</p>") %>');
+ $('#message_text').fadeIn( function(){
+ $('#message_content').delay(8000).fadeOut( function(){
+ $('#form_content').fadeIn();
+ });
+ });
+});
View
4 app/views/events/_submit.html.erb
@@ -1,7 +1,3 @@
-<div id="message_container"><div id="message_content">
- <div id="create_wait"><%= image_tag "cycle-medium.gif" %><br />Submitting your event, please wait...</div>
- <div id="message_text"></div>
-</div></div>
<div id="add_panel">
<table>
<tr>

No commit comments for this range

Something went wrong with that request. Please try again.