Skip to content

Mf 780 manage entries page design updates #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wesww wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Mf 780 manage entries page design updates #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3ade2d8
removing whitespace from line endings; converting indentation to spaces
wesww Jan 20, 2016
8d08fb3
fixing code indentation
wesww Jan 20, 2016
767b0a0
disabling wpautop here and removing css overrides needed to fix wpaut…
wesww Jan 20, 2016
db5f6c3
simplifying complicated switch statement
wesww Jan 20, 2016
eb3b6f5
splitting off faire entry and faire entry modals into files
wesww Jan 20, 2016
7dd1c96
initializing popover
wesww Jan 20, 2016
6739caa
Merge branch 'master' into mf-780-manage-entries-updates
wesww Jan 21, 2016
2567d18
maker admin styles
wesww Jan 21, 2016
a20bd31
adding new styles; moving broken out code back to inline in long file
wesww Jan 22, 2016
5226ee7
adding new design header
wesww Jan 22, 2016
41dbc34
putting focus trigger on settings popover
wesww Jan 22, 2016
773e8e2
Merge branch 'master' into mf-780-manage-entries-updates
wesww Jan 22, 2016
46147ab
responsive button styles; more layout formatting
wesww Jan 22, 2016
0f9e26a
Merge branch 'master' into mf-780-manage-entries-updates
wesww Jan 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion wp-content/themes/makerfaire/css/style.css
View file
Open in desktop

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions wp-content/themes/makerfaire/functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1952,24 +1952,24 @@ function gv_add_faire($additional_fields){
GravityView_Entry_List $this The current class instance */
add_filter('gform_entry_field_value','gv_faire_name',10,4);
function gv_faire_name($display_value, $field, $entry, $form){
if($field["type"]=='faire_name'){
global $wpdb;
if($field["type"]=='faire_name') {
global $wpdb;

$form_id = $entry['form_id'];
$sql = "select faire_name from wp_mf_faire where FIND_IN_SET ($form_id,wp_mf_faire.form_ids)> 0";
$faire = $wpdb->get_results($sql);

$faire_name = (isset($faire[0]->faire_name) ? $faire[0]->faire_name:$sql);
$display_value = $faire_name;
}elseif($field["type"]=='cancel_link'){
$display_value = '<a href="#cancelEntry" data-toggle="modal" data-projName="'.$entry['151'].'" data-entry-id="'.$entry['id'].'">Cancel</a>';
}elseif($field["type"]=='copy_entry'){
$display_value = '<a href="#copy_entry" data-toggle="modal" data-entry-id="'.$entry['id'].'">Copy</a>';
}elseif($field["type"]=='delete_entry'){
$display_value = '<a href="#deleteEntry" data-toggle="modal" data-projName="'.$entry['151'].'" data-entry-id="'.$entry['id'].'">Delete</a>';
}
$form_id = $entry['form_id'];
$sql = "select faire_name from wp_mf_faire where FIND_IN_SET ($form_id,wp_mf_faire.form_ids)> 0";
$faire = $wpdb->get_results($sql);

$faire_name = (isset($faire[0]->faire_name) ? $faire[0]->faire_name:$sql);
$display_value = $faire_name;
} elseif($field["type"]=='cancel_link') {
$display_value = '<a href="#cancelEntry" data-toggle="modal" data-projName="'.$entry['151'].'" data-entry-id="'.$entry['id'].'">Cancel</a>';
} elseif($field["type"]=='copy_entry') {
$display_value = '<a href="#copy_entry" data-toggle="modal" data-entry-id="'.$entry['id'].'">Copy</a>';
} elseif($field["type"]=='delete_entry') {
$display_value = '<a href="#deleteEntry" data-toggle="modal" data-projName="'.$entry['151'].'" data-entry-id="'.$entry['id'].'">Delete</a>';
}

return $display_value;
return $display_value;
}

/**
Expand Down
504 changes: 206 additions & 298 deletions wp-content/themes/makerfaire/gravityview/list-body.php
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions wp-content/themes/makerfaire/gravityview/manage-faire-entries/faire-entry-js.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<!-- Faire entry scripts for "list-body.php" -->
<script>
jQuery(document).ready(function() {
jQuery('[data-toggle="popover"]').popover();
});
</script>
75 changes: 75 additions & 0 deletions wp-content/themes/makerfaire/gravityview/manage-faire-entries/faire-entry-modals.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
<!-- Faire entry modals for "list-body.php" -->
<!-- Modal to cancel entry -->
<div class="modal" id="cancelEntry">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
<h4 class="modal-title">Cancel <span id="projName"></span>, Exhibit ID: <span id="cancelEntryID" name="entryID"></span></h4>
</div>
<div class="modal-body">
<div id="cancelText">
<p>Sorry you can't make it. Why are you canceling?</p><br/>
<textarea rows="4" cols="50" name="cancelReason"></textarea>
</div>
<span id="cancelResponse"></span><br/>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" id="submitCancel">Submit</button>
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
</div>
</div>
</div>
</div>

<!-- Modal to copy entry to a new form -->
<div class="modal" id="copy_entry">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
<h4 class="modal-title">Copy Exhibit ID: <span id="copyEntryID" name="entryID"></span></h4>
</div>
<div class="modal-body">
<?php if(!empty($formArr)) { ?>
<p>Please choose from the options below:</p><br/>
<select id="copy2Form">
<?php foreach($formArr as $availForm) {
echo '<option value='.$availForm[0].'>'.$availForm[1].'</option>';
} ?>
</select>
<?php } else {
echo 'No Open faires at the moment';
} ?>
<br/><span id="copyResponse"></span><br/>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" id="submitCopy">Submit</button>
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
</div>
</div>
</div>
</div>

<!--Modal to delete entry-->
<div class="modal" id="deleteEntry">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
<h4 class="modal-title">Delete <span id="delProjName"></span>, Exhibit ID: <span id="deleteEntryID" name="entryID"></span></h4>
</div>
<div class="modal-body">
<div id="deleteText">
<p>Are you sure you want to trash this entry? You can not reverse this action.</p>
</div>
<span id="deleteResponse"></span><br/>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" id="submitDelete">Yes, delete it</button>
<button type="button" class="btn btn-default" id="cancelDelete" data-dismiss="modal">No, I'll keep it</button>
<button type="button" class="btn btn-default" id="closeDelete" data-dismiss="modal">Close</button>
</div>
</div>
</div>
</div>
31 changes: 31 additions & 0 deletions wp-content/themes/makerfaire/gravityview/manage-faire-entries/header.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<div class="clearfix">
<h4 class="welcome-head pull-left">Hi
<?php echo $current_user->user_firstname.' ';
echo $current_user->user_lastname;
?>
</h4>
<div class="settings-pop-btn pull-right">
<button type="button" class="btn btn-default btn-no-border notifications-button"
data-toggle="popover" data-html="true"
data-placement="bottom" data-trigger="focus"
data-content='<div class="manage-entry-popover">
<a href="/login/?mode=reset">Change Password</a>
<a href="/login/?action=logout">Log Out</a>
<h6 class="popover-head">Questions?</h6>
<a href="mailto:support@makerfaire.com">Email us</a>
</div>'>
Settings &amp; Help
<i class="fa fa-cog"></i>
</button>
</div>
</div>
<div class="clearfix">
<h2 class="title-head pull-left">Your Maker Faire entries</h2>
<span class="submit-entry pull-right">
<a href="http://makerfaire.com/bay-area-2016/call-for-makers/" target="_blank"
class="btn btn-primary btn-no-border">
Submit another entry
</a>
</span>
</div>
<hr class="header-break"/>
5 changes: 5 additions & 0 deletions wp-content/themes/makerfaire/less/global.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,3 +229,8 @@ a:focus {
width: 100%;
position: absolute;
}

.btn.btn-no-border {
border: none;
border-radius: 0
}
Loading