Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

New Popup form style, Fixes #5931

  • Loading branch information...
commit de5666c2bb564acde1d5ab28f97198d09fa02c3c 1 parent 5ca873d
@stefancrain stefancrain authored
View
30 civicrm/custom/templates/CRM/IMAP/Page/Activities.tpl
@@ -36,19 +36,41 @@
<div id="tabs">
<ul>
<li><a href="#tab1">Find Contact</a></li>
- <!-- <li><a href="#tabs-2">Add Contact</a></li> -->
</ul>
<div id="tab1">
- <input type="hidden" class="hidden" id="email_id" name="email_id">
- <input type="hidden" class="hidden" id="imap_id" name="imap_id">
+ <input type="hidden" class="hidden" id="email_id" name="email_id">
+ <input type="hidden" class="hidden" id="imap_id" name="imap_id">
+
+ <label for="first_name">
+ <span class="label_def">First Name: </span>
<input type="text" placeholder="First Name" class="form-text first_name" name="first_name">
+ </label>
+ <label for="last_name">
+ <span class="label_def">Last Name: </span>
<input type="text" placeholder="Last Name" class="form-text last_name" name="last_name">
+ </label>
+ <label for="email_address">
+ <span class="label_def">Email: </span>
<input type="text" placeholder="Email Address" class="email-address email_address" name="email_address">
+ </label>
+ <label for="dob">
+ <span class="label_def">DOB: </span>
<input type="text" placeholder="yyyy-mm-dd" class="form-text dob" name="dob">
+ </label>
+ <label for="phone">
+ <span class="label_def">Phone #: </span>
<input type="text" placeholder="Phone Number" class="form-text phone" name="phone">
+ </label>
+ <label for="street_address">
+ <span class="label_def">St. Address: </span>
<input type="text" placeholder="Street Address" class="form-text street_address" name="street_address">
+ </label>
+ <label for="city">
+ <span class="label_def">City: </span>
<input type="text" placeholder="City" class="form-text city" name="city">
- <input type="button" class="imapper-submit" id="filter" value="Search" name="filter">
+ </label>
+
+ <input type="button" class="imapper-submit" id="filter" value="Search" name="filter">
<div id="imapper-contacts-list" class="contacts-list"></div>
<input type="button" class="imapper-submit" id="reassign" value="Assign" name="reassign">
</div>
View
79 civicrm/custom/templates/CRM/IMAP/Page/Mapper.tpl
@@ -39,26 +39,77 @@
<input type="hidden" class="hidden" id="email_id" name="email_id">
<input type="hidden" class="hidden" id="imap_id" name="imap_id">
<div id="tab1">
- <input type="text" placeholder="First Name" class="form-text first_name" name="first_name">
- <input type="text" placeholder="Last Name" class="form-text last_name" name="last_name">
- <input type="text" placeholder="Email Address" class="form-text email_address" name="email_address">
- <input type="text" placeholder="yyyy-mm-dd" class="form-text dob" name="dob">
- <input type="text" placeholder="Phone Number" class="form-text phone" name="phone">
- <input type="text" placeholder="Street Address" class="form-text street_address" name="street_address">
- <input type="text" placeholder="City" class="form-text city" name="city">
+ <label for="first_name">
+ <span class="label_def">First Name: </span>
+ <input type="text" placeholder="First Name" class="form-text first_name" name="first_name">
+ </label>
+ <label for="last_name">
+ <span class="label_def">Last Name: </span>
+ <input type="text" placeholder="Last Name" class="form-text last_name" name="last_name">
+ </label>
+ <label for="email_address">
+ <span class="label_def">Email: </span>
+ <input type="text" placeholder="Email Address" class="form-text email_address" name="email_address">
+ </label>
+ <label for="dob">
+ <span class="label_def">DOB: </span>
+ <input type="text" placeholder="yyyy-mm-dd" class="form-text dob" name="dob">
+ </label>
+ <label for="phone">
+ <span class="label_def">Phone #: </span>
+ <input type="text" placeholder="Phone Number" class="form-text phone" name="phone">
+ </label>
+ <label for="street_address">
+ <span class="label_def">St. Address: </span>
+ <input type="text" placeholder="Street Address" class="form-text street_address" name="street_address">
+ </label>
+ <label for="city">
+ <span class="label_def">City: </span>
+ <input type="text" placeholder="City" class="form-text city" name="city">
+ </label>
+
<input type="button" class="imapper-submit" id="filter" value="Search" name="filter">
<div id="imapper-contacts-list" class="contacts-list"> </div>
<input type="button" class="imapper-submit" id="assign" value="Assign" name="Assign">
</div>
<div id="tab2">
- <input type="text" placeholder="First Name" class="form-text first_name" name="first_name">
- <input type="text" placeholder="Last Name" class="form-text last_name" name="last_name">
- <input type="text" placeholder="Email Address" class="email-address email_address" name="email_address">
- <input type="text" placeholder="Phone Number" class="form-text phone" name="phone">
- <input type="text" placeholder="Street Address" class="form-text street_address" name="street_address">
- <input type="text" placeholder="Street Address (2)" class="form-text street_address_2" name="street_address_2">
+ <label for="first_name">
+ <span class="label_def">First Name: </span>
+ <input type="text" placeholder="First Name" class="form-text first_name" name="first_name">
+ </label>
+ <label for="last_name">
+ <span class="label_def">Last Name: </span>
+ <input type="text" placeholder="Last Name" class="form-text last_name" name="last_name">
+ </label>
+ <label for="email_address">
+ <span class="label_def">Email: </span>
+ <input type="text" placeholder="Email Address" class="email-address email_address" name="email_address">
+ </label>
+ <label for="dob">
+ <span class="label_def">DOB: </span>
+ <input type="text" placeholder="yyyy-mm-dd" class="form-text dob" name="dob">
+ </label>
+ <label for="phone">
+ <span class="label_def">Phone #: </span>
+ <input type="text" placeholder="Phone Number" class="form-text phone" name="phone">
+ </label>
+ <label for="street_address">
+ <span class="label_def">St. Address: </span>
+ <input type="text" placeholder="Street Address" class="form-text street_address" name="street_address">
+ </label>
+ <label for="street_address">
+ <span class="label_def">St. Add 2: </span>
+ <input type="text" placeholder="Street Address (2)" class="form-text street_address_2" name="street_address_2">
+ </label>
+ <label for="city">
+ <span class="label_def">City: </span>
+ <input type="text" placeholder="City" class="form-text city" name="city">
+ </label>
+ <label for="zip">
+ <span class="label_def">Zip Code: </span>
<input type="text" placeholder="Zip Code" class="form-text zip" name="zip">
- <input type="text" placeholder="City" class="form-text city" name="city">
+ </label>
+
<input type="button" class="imapper-submit" id="add-contact" value="Add Contact" name="add-contact">
</div>
</div>
View
18 modules/nyss_imapper/nyss_imapper.css
@@ -30,7 +30,7 @@
.linkContact input.linkContactButton.visible {display:inline;}
.contactsBody .showContactNumResult {font-style:italic; text-align: center; border-bottom:1px solid #000; display:none;}
.contactsBody .showContactNumResult span {font-style:normal; font-weight:bold;}
-.contactList {height:220px; overflow:auto; display:none;}
+.contactList {height:180px; overflow:auto; display:none;}
.contactList .loadingBox {border-bottom: 1px solid #000;}
.contactList .contactItem {border-bottom: 1px solid #000; padding:5px 8px;font-size:11px;clear:both;overflow:auto;}
.contactList .contactItem.active {background:#d99;}
@@ -41,7 +41,7 @@
.contactList .contactItem .left div {font-size:10px;}
.contactList .contactItem .right {float:right; margin-top:5px;}
.find-match-popup, .delete-confirm{ display: none;}
-.contacts-list{height:220px; overflow:auto; }
+.contacts-list{height:180px; overflow:auto; }
.imapperbox .full{ margin-bottom: 10px;}
.imapperbox .full h1{ padding:10px 3px; margin-bottom: 0;}
.imapperbox .full h1 small{ color:#999; font-size: 20px;}
@@ -82,7 +82,7 @@ a.tag-selected:hover { color: #fff!important; background-color: red; }
#message_left_email{ width:640px; height:350px; overflow:auto; }
#message_right{ width:270px; float:left; border-left: 1px solid #ccc; padding:0 0 0 10px; height:455px;}
#find-match-popup .ui-tabs-panel { padding:0;}
-.first_name,.last_name {width:46%;}
+/*.first_name,.last_name {width:46%;}*/
.hidden{display:none;}
#assign_container {padding-left: 100px;}
#imapper-messages {scrollbar: always;overflow: auto;height: 600px;float: left;}
@@ -108,4 +108,14 @@ a.tag-selected:hover { color: #fff!important; background-color: red; }
vertical-align: baseline;
white-space: nowrap;
}
-.imapper-message-box td { vertical-align: middle!important; }
+.imapper-message-box td { vertical-align: middle!important; }
+#message_right label{
+ float: left;
+ display: block;
+}
+.label_def{
+ width: 86px;
+ font-weight: bold;
+ float: left;
+ margin: 0.4em 0 0.02em;
+}
Please sign in to comment.
Something went wrong with that request. Please try again.