Skip to content

Commit

Permalink
fixing availability btn style names in availability.js (#1882)
Browse files Browse the repository at this point in the history
* fixing availability btn style names in availability.js
* Fixing the /edit page UI
  • Loading branch information
mekarpeles committed Feb 15, 2019
1 parent 7e79a93 commit 2009881
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 29 deletions.
6 changes: 3 additions & 3 deletions openlibrary/plugins/openlibrary/js/availability.js
Expand Up @@ -220,15 +220,15 @@ $(function(){
link = ' href="/books/' + work.openlibrary_edition + '/x/borrow" ';

if (work.status === 'open') {
cls = 'cta-btn--available cta-btn';
cls = 'cta-btn--available';
msg = 'Read';
} else if (work.status === 'borrow_available') {
cls = 'cta-btn--available cta-btn';
cls = 'cta-btn--available';
msg = 'Borrow';
} else if (work.status === 'borrow_unavailable') {
tag = 'span';
link = '';
cls = 'cta-btn cta-btn--unavailable';
cls = 'cta-btn--unavailable';
msg = '<form method="POST" action="/books/' + work.openlibrary_edition + '/x/borrow?action=join-waitinglist" class="join-waitlist waitinglist-form"><input type="hidden" name="action" value="join-waitinglist">';
if (work.num_waitlist !== '0') {
msg += 'Join Waitlist <span class="cta-btn__badge">' + work.num_waitlist + '</span></form>';
Expand Down
11 changes: 6 additions & 5 deletions openlibrary/templates/books/edit/edition.html
Expand Up @@ -615,6 +615,10 @@
<fieldset class="minor">
<legend>$_("Dimensions")</legend>
$ dimensions = book.get_physical_dimensions() or storage(height="", width="", depth="", units="inches")
<span class="tip">
$:radiobuttons("edition--physical_dimensions--units", ["centimeters", "inches"], dimensions.units)
</span>

<div class="formElement">
<div class="input">
<table cellpadding="1">
Expand All @@ -626,11 +630,7 @@
</tr>
<tr>
<td><span class="tip"><label for="dimensions-width">$_("Width:")</label> </span></td>
<td><input name="edition--physical_dimensions--width" type="number" id="dimensions-width" size="6" value="$dimensions.width"/>
<span class="tip">
$:radiobuttons("edition--physical_dimensions--units", ["centimeters", "inches"], dimensions.units)
</span>
</td>
<td><input name="edition--physical_dimensions--width" type="number" id="dimensions-width" size="6" value="$dimensions.width"/></td>
</tr>
<tr>
<td><span class="tip"><label for="dimensions-depth">$_("Depth:")</label> </span></td>
Expand Down Expand Up @@ -747,6 +747,7 @@
\$("a#libraryMode").on('click', function(event) {
event.preventDefault();

\$(".librarian").toggleClass("hidden");
\$(".librarian").toggleClass("librarian-on");
\$(this).parent().find('#modeToggle').toggleText("Turn on","Exit");
});
Expand Down
2 changes: 1 addition & 1 deletion static/css/components/buttonCta.less
Expand Up @@ -6,7 +6,7 @@
// override default anchor styles
a.cta-btn {
font-size: 14px;
color: @white;
color: @white !important;
width: 100%;
display: block;
border: 0;
Expand Down
11 changes: 0 additions & 11 deletions static/css/components/form.olform.less
Expand Up @@ -132,17 +132,6 @@
width: 90%;
}

&.books {
.major {
// stylelint-disable-next-line max-nesting-depth
input[type=text],
input[type=email],
input[type=password],
textarea {
width: 848px;
}
}
}
.input {
select {
width: 130px;
Expand Down
6 changes: 2 additions & 4 deletions static/css/components/search-result-item.less
Expand Up @@ -66,6 +66,7 @@
img {
max-width: 100%;
max-height: 300px;
width: 175px;
}
}
.imageLg {
Expand Down Expand Up @@ -108,12 +109,9 @@
.list-books {
.searchResultItem {
flex-wrap: nowrap;
.bookcover {
.bookcover {
width: 175px;
text-align: right;
img {
width: 175px;
}
}
.imageLg {
width: 175px;
Expand Down
1 change: 0 additions & 1 deletion static/css/legacy-wmd.less
Expand Up @@ -49,7 +49,6 @@
/* stylelint-disable no-descending-specificity */
fieldset.major .wmd-preview,
form.olform.books .formElement .input .wmd-preview {
width: 848px;
min-height: 47px;
padding: 3px;
}
Expand Down
4 changes: 0 additions & 4 deletions static/css/legacy.less
Expand Up @@ -2300,23 +2300,19 @@ div#subjectLists {
They may be used in another places as well */
fieldset {
&.minor {
float: left;
width: 400px;
}
}
table.identifiers {
width: 395px;
}
.formBack {
float: left;
width: 830px;
&Left {
float: left;
width: 670px;
}
&Right {
float: left;
width: 120px;
}
}
/**
Expand Down

0 comments on commit 2009881

Please sign in to comment.