Browse Source

Merge branch 'dev'

pull/107/head 1.0.0
Ned Zimmerman 7 years ago
parent
commit
1b2c22538d
No known key found for this signature in database
GPG Key ID: FF56334A013120CA
  1. 35
      404.php
  2. 978
      LICENSE.md
  3. 44
      README.md
  4. BIN
      assets/images/header.jpg
  5. 45
      assets/scripts/catalog-admin.js
  6. 8
      assets/styles/aldine.scss
  7. 17
      assets/styles/components/_book.scss
  8. 14
      assets/styles/components/_forms.scss
  9. 3
      assets/styles/editor.scss
  10. 0
      assets/styles/layouts/_footer.scss
  11. 9
      assets/styles/layouts/_header.scss
  12. 33
      assets/styles/layouts/_page-catalog.scss
  13. 2
      assets/styles/layouts/_page-home.scss
  14. 0
      assets/styles/layouts/_page.scss
  15. 13
      assets/styles/layouts/_pages.scss
  16. 42
      assets/styles/layouts/_signup.scss
  17. 3
      assets/styles/layouts/_tinymce.scss
  18. 8
      composer.json
  19. 50
      composer.lock
  20. BIN
      dist/images/header.jpg
  21. 9
      dist/mix-manifest.json
  22. 2
      dist/scripts/aldine.js
  23. 1
      dist/scripts/catalog-admin.js
  24. 2
      dist/scripts/customizer.js
  25. 2
      dist/styles/aldine.css
  26. 2
      dist/styles/editor.css
  27. 55
      functions.php
  28. 2
      header.php
  29. 98
      inc/actions/namespace.php
  30. 5
      inc/activation/namespace.php
  31. 76
      inc/admin/namespace.php
  32. 50
      inc/customizer/namespace.php
  33. 130
      inc/helpers/namespace.php
  34. 58
      inc/shortcodes/namespace.php
  35. 334
      languages/pressbooks-aldine.pot
  36. 1642
      package-lock.json
  37. 12
      package.json
  38. 46
      page-catalog.php
  39. 12
      partials/content-front-page.php
  40. 20
      partials/content-page-catalog.php
  41. 38
      readme.txt
  42. BIN
      screenshot.png
  43. 10
      style.css
  44. 1
      webpack.mix.js
  45. 1765
      yarn.lock

35
404.php

@ -12,44 +12,13 @@ get_header(); ?>
<div id="primary" class="content-area"> <div id="primary" class="content-area">
<main id="main" class="site-main"> <main id="main" class="site-main">
<section class="error-404 not-found"> <section class="error-404 not-found page-section">
<header class="page-header"> <header class="page-header">
<h1 class="page-title"><?php esc_html_e( 'Oops! That page can&rsquo;t be found.', 'pressbooks-aldine' ); ?></h1> <h1 class="page-title"><?php esc_html_e( 'Oops! That page can&rsquo;t be found.', 'pressbooks-aldine' ); ?></h1>
</header><!-- .page-header --> </header><!-- .page-header -->
<div class="page-content"> <div class="page-content">
<p><?php esc_html_e( 'It looks like nothing was found at this location. Maybe try one of the links below or a search?', 'pressbooks-aldine' ); ?></p> <p><?php esc_html_e( 'It looks like nothing was found at this location.', 'pressbooks-aldine' ); ?></p>
<?php
get_search_form();
the_widget( 'WP_Widget_Recent_Posts' );
?>
<div class="widget widget_categories">
<h2 class="widget-title"><?php esc_html_e( 'Most Used Categories', 'pressbooks-aldine' ); ?></h2>
<ul>
<?php
wp_list_categories( [
'orderby' => 'count',
'order' => 'DESC',
'show_count' => 1,
'title_li' => '',
'number' => 10,
] );
?>
</ul>
</div><!-- .widget -->
<?php
/* translators: %1$s: smiley */
$archive_content = '<p>' . sprintf( esc_html__( 'Try looking in the monthly archives. %1$s', 'pressbooks-aldine' ), convert_smilies( ':)' ) ) . '</p>';
the_widget( 'WP_Widget_Archives', 'dropdown=1', "after_title=</h2>$archive_content" );
the_widget( 'WP_Widget_Tag_Cloud' );
?>
</div><!-- .page-content --> </div><!-- .page-content -->
</section><!-- .error-404 --> </section><!-- .error-404 -->

978
LICENSE.md

@ -1,339 +1,675 @@
GNU GENERAL PUBLIC LICENSE ### GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Version 3, 29 June 2007
Copyright (C) 1989, 1991 Free Software Foundation, Inc., <http://fsf.org/>
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Copyright (C) 2007 Free Software Foundation, Inc.
Everyone is permitted to copy and distribute verbatim copies <https://fsf.org/>
of this license document, but changing it is not allowed.
Everyone is permitted to copy and distribute verbatim copies of this
Preamble license document, but changing it is not allowed.
The licenses for most software are designed to take away your ### Preamble
freedom to share and change it. By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free The GNU General Public License is a free, copyleft license for
software--to make sure the software is free for all its users. This software and other kinds of works.
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to The licenses for most software and other practical works are designed
using it. (Some other Free Software Foundation software is covered by to take away your freedom to share and change the works. By contrast,
the GNU Lesser General Public License instead.) You can apply it to the GNU General Public License is intended to guarantee your freedom
your programs, too. to share and change all versions of a program--to make sure it remains
free software for all its users. We, the Free Software Foundation, use
When we speak of free software, we are referring to freedom, not the GNU General Public License for most of our software; it applies
price. Our General Public Licenses are designed to make sure that you also to any other work released this way by its authors. You can apply
it to your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it them if you wish), that you receive source code or can get it if you
if you want it, that you can change the software or use pieces of it want it, that you can change the software or use pieces of it in new
in new free programs; and that you know you can do these things. free programs, and that you know you can do these things.
To protect your rights, we need to make restrictions that forbid To protect your rights, we need to prevent others from denying you
anyone to deny you these rights or to ask you to surrender the rights. these rights or asking you to surrender the rights. Therefore, you
These restrictions translate to certain responsibilities for you if you have certain responsibilities if you distribute copies of the
distribute copies of the software, or if you modify it. software, or if you modify it: responsibilities to respect the freedom
of others.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that For example, if you distribute copies of such a program, whether
you have. You must make sure that they, too, receive or can get the gratis or for a fee, you must pass on to the recipients the same
source code. And you must show them these terms so they know their freedoms that you received. You must make sure that they, too, receive
rights. or can get the source code. And you must show them these terms so they
know their rights.
We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy, Developers that use the GNU GPL protect your rights with two steps:
distribute and/or modify the software. (1) assert copyright on the software, and (2) offer you this License
giving you legal permission to copy, distribute and/or modify it.
Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free For the developers' and authors' protection, the GPL clearly explains
software. If the software is modified by someone else and passed on, we that there is no warranty for this free software. For both users' and
want its recipients to know that what they have is not the original, so authors' sake, the GPL requires that modified versions be marked as
that any problems introduced by others will not reflect on the original changed, so that their problems will not be attributed erroneously to
authors' reputations. authors of previous versions.
Finally, any free program is threatened constantly by software Some devices are designed to deny users access to install or run
patents. We wish to avoid the danger that redistributors of a free modified versions of the software inside them, although the
program will individually obtain patent licenses, in effect making the manufacturer can do so. This is fundamentally incompatible with the
program proprietary. To prevent this, we have made it clear that any aim of protecting users' freedom to change the software. The
patent must be licensed for everyone's free use or not licensed at all. systematic pattern of such abuse occurs in the area of products for
individuals to use, which is precisely where it is most unacceptable.
The precise terms and conditions for copying, distribution and Therefore, we have designed this version of the GPL to prohibit the
practice for those products. If such problems arise substantially in
other domains, we stand ready to extend this provision to those
domains in future versions of the GPL, as needed to protect the
freedom of users.
Finally, every program is threatened constantly by software patents.
States should not allow patents to restrict development and use of
software on general-purpose computers, but in those that do, we wish
to avoid the special danger that patents applied to a free program
could make it effectively proprietary. To prevent this, the GPL
assures that patents cannot be used to render the program non-free.
The precise terms and conditions for copying, distribution and
modification follow. modification follow.
GNU GENERAL PUBLIC LICENSE ### TERMS AND CONDITIONS
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
#### 0. Definitions.
0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed "This License" refers to version 3 of the GNU General Public License.
under the terms of this General Public License. The "Program", below,
refers to any such program or work, and a "work based on the Program" "Copyright" also means copyright-like laws that apply to other kinds
means either the Program or any derivative work under copyright law: of works, such as semiconductor masks.
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another "The Program" refers to any copyrightable work licensed under this
language. (Hereinafter, translation is included without limitation in License. Each licensee is addressed as "you". "Licensees" and
the term "modification".) Each licensee is addressed as "you". "recipients" may be individuals or organizations.
Activities other than copying, distribution and modification are not To "modify" a work means to copy from or adapt all or part of the work
covered by this License; they are outside its scope. The act of in a fashion requiring copyright permission, other than the making of
running the Program is not restricted, and the output from the Program an exact copy. The resulting work is called a "modified version" of
is covered only if its contents constitute a work based on the the earlier work or a work "based on" the earlier work.
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does. A "covered work" means either the unmodified Program or a work based
on the Program.
1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you To "propagate" a work means to do anything with it that, without
conspicuously and appropriately publish on each copy an appropriate permission, would make you directly or secondarily liable for
copyright notice and disclaimer of warranty; keep intact all the infringement under applicable copyright law, except executing it on a
notices that refer to this License and to the absence of any warranty; computer or modifying a private copy. Propagation includes copying,
and give any other recipients of the Program a copy of this License distribution (with or without modification), making available to the
along with the Program. public, and in some countries other activities as well.
You may charge a fee for the physical act of transferring a copy, and To "convey" a work means any kind of propagation that enables other
you may at your option offer warranty protection in exchange for a fee. parties to make or receive copies. Mere interaction with a user
through a computer network, with no transfer of a copy, is not
2. You may modify your copy or copies of the Program or any portion conveying.
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1 An interactive user interface displays "Appropriate Legal Notices" to
above, provided that you also meet all of these conditions: the extent that it includes a convenient and prominently visible
feature that (1) displays an appropriate copyright notice, and (2)
a) You must cause the modified files to carry prominent notices tells the user that there is no warranty for the work (except to the
stating that you changed the files and the date of any change. extent that warranties are provided), that licensees may convey the
work under this License, and how to view a copy of this License. If
b) You must cause any work that you distribute or publish, that in the interface presents a list of user commands or options, such as a
whole or in part contains or is derived from the Program or any menu, a prominent item in the list meets this criterion.
part thereof, to be licensed as a whole at no charge to all third
parties under the terms of this License. #### 1. Source Code.
c) If the modified program normally reads commands interactively The "source code" for a work means the preferred form of the work for
when run, you must cause it, when started running for such making modifications to it. "Object code" means any non-source form of
interactive use in the most ordinary way, to print or display an a work.
announcement including an appropriate copyright notice and a
notice that there is no warranty (or else, saying that you provide A "Standard Interface" means an interface that either is an official
a warranty) and that users may redistribute the program under standard defined by a recognized standards body, or, in the case of
these conditions, and telling the user how to view a copy of this interfaces specified for a particular programming language, one that
License. (Exception: if the Program itself is interactive but is widely used among developers working in that language.
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.) The "System Libraries" of an executable work include anything, other
than the work as a whole, that (a) is included in the normal form of
These requirements apply to the modified work as a whole. If packaging a Major Component, but which is not part of that Major
identifiable sections of that work are not derived from the Program, Component, and (b) serves only to enable use of the work with that
and can be reasonably considered independent and separate works in Major Component, or to implement a Standard Interface for which an
themselves, then this License, and its terms, do not apply to those implementation is available to the public in source code form. A
sections when you distribute them as separate works. But when you "Major Component", in this context, means a major essential component
distribute the same sections as part of a whole which is a work based (kernel, window system, and so on) of the specific operating system
on the Program, the distribution of the whole must be on the terms of (if any) on which the executable work runs, or a compiler used to
this License, whose permissions for other licensees extend to the produce the work, or an object code interpreter used to run it.
entire whole, and thus to each and every part regardless of who wrote it.
The "Corresponding Source" for a work in object code form means all
Thus, it is not the intent of this section to claim rights or contest the source code needed to generate, install, and (for an executable
your rights to work written entirely by you; rather, the intent is to work) run the object code and to modify the work, including scripts to
exercise the right to control the distribution of derivative or control those activities. However, it does not include the work's
collective works based on the Program. System Libraries, or general-purpose tools or generally available free
programs which are used unmodified in performing those activities but
In addition, mere aggregation of another work not based on the Program which are not part of the work. For example, Corresponding Source
with the Program (or with a work based on the Program) on a volume of includes interface definition files associated with source files for
a storage or distribution medium does not bring the other work under the work, and the source code for shared libraries and dynamically
the scope of this License. linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
3. You may copy and distribute the Program (or a work based on it, subprograms and other parts of the work.
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following: The Corresponding Source need not include anything that users can
regenerate automatically from other parts of the Corresponding Source.
a) Accompany it with the complete corresponding machine-readable
source code, which must be distributed under the terms of Sections The Corresponding Source for a work in source code form is that same
1 and 2 above on a medium customarily used for software interchange; or, work.
b) Accompany it with a written offer, valid for at least three #### 2. Basic Permissions.
years, to give any third party, for a charge no more than your
cost of physically performing source distribution, a complete All rights granted under this License are granted for the term of
machine-readable copy of the corresponding source code, to be copyright on the Program, and are irrevocable provided the stated
distributed under the terms of Sections 1 and 2 above on a medium conditions are met. This License explicitly affirms your unlimited
customarily used for software interchange; or, permission to run the unmodified Program. The output from running a
covered work is covered by this License only if the output, given its
c) Accompany it with the information you received as to the offer content, constitutes a covered work. This License acknowledges your
to distribute corresponding source code. (This alternative is rights of fair use or other equivalent, as provided by copyright law.
allowed only for noncommercial distribution and only if you
received the program in object code or executable form with such You may make, run and propagate covered works that you do not convey,
an offer, in accord with Subsection b above.) without conditions so long as your license otherwise remains in force.
You may convey covered works to others for the sole purpose of having
The source code for a work means the preferred form of the work for them make modifications exclusively for you, or provide you with
making modifications to it. For an executable work, complete source facilities for running those works, provided that you comply with the
code means all the source code for all modules it contains, plus any terms of this License in conveying all material for which you do not
associated interface definition files, plus the scripts used to control copyright. Those thus making or running the covered works for
control compilation and installation of the executable. However, as a you must do so exclusively on your behalf, under your direction and
special exception, the source code distributed need not include control, on terms that prohibit them from making any copies of your
anything that is normally distributed (in either source or binary copyrighted material outside their relationship with you.
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component Conveying under any other circumstances is permitted solely under the
itself accompanies the executable. conditions stated below. Sublicensing is not allowed; section 10 makes
it unnecessary.
If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent #### 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not No covered work shall be deemed part of an effective technological
compelled to copy the source along with the object code. measure under any applicable law fulfilling obligations under article
11 of the WIPO copyright treaty adopted on 20 December 1996, or
4. You may not copy, modify, sublicense, or distribute the Program similar laws prohibiting or restricting circumvention of such
except as expressly provided under this License. Any attempt measures.
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License. When you convey a covered work, you waive any legal power to forbid
However, parties who have received copies, or rights, from you under circumvention of technological measures to the extent such
this License will not have their licenses terminated so long as such circumvention is effected by exercising rights under this License with
parties remain in full compliance. respect to the covered work, and you disclaim any intention to limit
operation or modification of the work as a means of enforcing, against
5. You are not required to accept this License, since you have not the work's users, your or third parties' legal rights to forbid
signed it. However, nothing else grants you permission to modify or circumvention of technological measures.
distribute the Program or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by #### 4. Conveying Verbatim Copies.
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and You may convey verbatim copies of the Program's source code as you
all its terms and conditions for copying, distributing or modifying receive it, in any medium, provided that you conspicuously and
the Program or works based on it. appropriately publish on each copy an appropriate copyright notice;
keep intact all notices stating that this License and any
6. Each time you redistribute the Program (or any work based on the non-permissive terms added in accord with section 7 apply to the code;
Program), the recipient automatically receives a license from the keep intact all notices of the absence of any warranty; and give all
original licensor to copy, distribute or modify the Program subject to recipients a copy of this License along with the Program.
these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein. You may charge any price or no price for each copy that you convey,
You are not responsible for enforcing compliance by third parties to and you may offer support or warranty protection for a fee.
#### 5. Conveying Modified Source Versions.
You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these
conditions:
- a) The work must carry prominent notices stating that you modified
it, and giving a relevant date.
- b) The work must carry prominent notices stating that it is
released under this License and any conditions added under
section 7. This requirement modifies the requirement in section 4
to "keep intact all notices".
- c) You must license the entire work, as a whole, under this
License to anyone who comes into possession of a copy. This
License will therefore apply, along with any applicable section 7
additional terms, to the whole of the work, and all its parts,
regardless of how they are packaged. This License gives no
permission to license the work in any other way, but it does not
invalidate such permission if you have separately received it.
- d) If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your
work need not make them do so.
A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work,
and which are not combined with it such as to form a larger program,
in or on a volume of a storage or distribution medium, is called an
"aggregate" if the compilation and its resulting copyright are not
used to limit the access or legal rights of the compilation's users
beyond what the individual works permit. Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.
#### 6. Conveying Non-Source Forms.
You may convey a covered work in object code form under the terms of
sections 4 and 5, provided that you also convey the machine-readable
Corresponding Source under the terms of this License, in one of these
ways:
- a) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by the
Corresponding Source fixed on a durable physical medium
customarily used for software interchange.
- b) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by a
written offer, valid for at least three years and valid for as
long as you offer spare parts or customer support for that product
model, to give anyone who possesses the object code either (1) a
copy of the Corresponding Source for all the software in the
product that is covered by this License, on a durable physical
medium customarily used for software interchange, for a price no
more than your reasonable cost of physically performing this
conveying of source, or (2) access to copy the Corresponding
Source from a network server at no charge.
- c) Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This
alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord
with subsection 6b.
- d) Convey the object code by offering access from a designated
place (gratis or for a charge), and offer equivalent access to the
Corresponding Source in the same way through the same place at no
further charge. You need not require recipients to copy the
Corresponding Source along with the object code. If the place to
copy the object code is a network server, the Corresponding Source
may be on a different server (operated by you or a third party)
that supports equivalent copying facilities, provided you maintain
clear directions next to the object code saying where to find the
Corresponding Source. Regardless of what server hosts the
Corresponding Source, you remain obligated to ensure that it is
available for as long as needed to satisfy these requirements.
- e) Convey the object code using peer-to-peer transmission,
provided you inform other peers where the object code and
Corresponding Source of the work are being offered to the general
public at no charge under subsection 6d.
A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.
A "User Product" is either (1) a "consumer product", which means any
tangible personal property which is normally used for personal,
family, or household purposes, or (2) anything designed or sold for
incorporation into a dwelling. In determining whether a product is a
consumer product, doubtful cases shall be resolved in favor of
coverage. For a particular product received by a particular user,
"normally used" refers to a typical or common use of that class of
product, regardless of the status of the particular user or of the way
in which the particular user actually uses, or expects or is expected
to use, the product. A product is a consumer product regardless of
whether the product has substantial commercial, industrial or
non-consumer uses, unless such uses represent the only significant
mode of use of the product.
"Installation Information" for a User Product means any methods,
procedures, authorization keys, or other information required to
install and execute modified versions of a covered work in that User
Product from a modified version of its Corresponding Source. The
information must suffice to ensure that the continued functioning of
the modified object code is in no case prevented or interfered with
solely because modification has been made.
If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information. But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
been installed in ROM).
The requirement to provide Installation Information does not include a
requirement to continue to provide support service, warranty, or
updates for a work that has been modified or installed by the
recipient, or for the User Product in which it has been modified or
installed. Access to a network may be denied when the modification
itself materially and adversely affects the operation of the network
or violates the rules and protocols for communication across the
network.
Corresponding Source conveyed, and Installation Information provided,
in accord with this section must be in a format that is publicly
documented (and with an implementation available to the public in
source code form), and must require no special password or key for
unpacking, reading or copying.
#### 7. Additional Terms.
"Additional permissions" are terms that supplement the terms of this
License by making exceptions from one or more of its conditions.
Additional permissions that are applicable to the entire Program shall
be treated as though they were included in this License, to the extent
that they are valid under applicable law. If additional permissions
apply only to part of the Program, that part may be used separately
under those permissions, but the entire Program remains governed by
this License without regard to the additional permissions.
When you convey a copy of a covered work, you may at your option
remove any additional permissions from that copy, or from any part of
it. (Additional permissions may be written to require their own
removal in certain cases when you modify the work.) You may place
additional permissions on material, added by you to a covered work,
for which you have or can give appropriate copyright permission.
Notwithstanding any other provision of this License, for material you
add to a covered work, you may (if authorized by the copyright holders
of that material) supplement the terms of this License with terms:
- a) Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or
- b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or
- c) Prohibiting misrepresentation of the origin of that material,
or requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or
- d) Limiting the use for publicity purposes of names of licensors
or authors of the material; or
- e) Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or
- f) Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions
of it) with contractual assumptions of liability to the recipient,
for any liability that these contractual assumptions directly
impose on those licensors and authors.
All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you
received it, or any part of it, contains a notice stating that it is
governed by this License along with a term that is a further
restriction, you may remove that term. If a license document contains
a further restriction but permits relicensing or conveying under this
License, you may add to a covered work material governed by the terms
of that license document, provided that the further restriction does
not survive such relicensing or conveying.
If you add terms to a covered work in accord with this section, you
must place, in the relevant source files, a statement of the
additional terms that apply to those files, or a notice indicating
where to find the applicable terms.
Additional terms, permissive or non-permissive, may be stated in the
form of a separately written license, or stated as exceptions; the
above requirements apply either way.
#### 8. Termination.
You may not propagate or modify a covered work except as expressly
provided under this License. Any attempt otherwise to propagate or
modify it is void, and will automatically terminate your rights under
this License (including any patent licenses granted under the third
paragraph of section 11).
However, if you cease all violation of this License, then your license
from a particular copyright holder is reinstated (a) provisionally,
unless and until the copyright holder explicitly and finally
terminates your license, and (b) permanently, if the copyright holder
fails to notify you of the violation by some reasonable means prior to
60 days after the cessation.
Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.
Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.
#### 9. Acceptance Not Required for Having Copies.
You are not required to accept this License in order to receive or run
a copy of the Program. Ancillary propagation of a covered work
occurring solely as a consequence of using peer-to-peer transmission
to receive a copy likewise does not require acceptance. However,
nothing other than this License grants you permission to propagate or
modify any covered work. These actions infringe copyright if you do
not accept this License. Therefore, by modifying or propagating a
covered work, you indicate your acceptance of this License to do so.
#### 10. Automatic Licensing of Downstream Recipients.
Each time you convey a covered work, the recipient automatically
receives a license from the original licensors, to run, modify and
propagate that work, subject to this License. You are not responsible
for enforcing compliance by third parties with this License.
An "entity transaction" is a transaction transferring control of an
organization, or substantially all assets of one, or subdividing an
organization, or merging organizations. If propagation of a covered
work results from an entity transaction, each party to that
transaction who receives a copy of the work also receives whatever
licenses to the work the party's predecessor in interest had or could
give under the previous paragraph, plus a right to possession of the
Corresponding Source of the work from the predecessor in interest, if
the predecessor has it or can get it with reasonable efforts.
You may not impose any further restrictions on the exercise of the
rights granted or affirmed under this License. For example, you may
not impose a license fee, royalty, or other charge for exercise of
rights granted under this License, and you may not initiate litigation
(including a cross-claim or counterclaim in a lawsuit) alleging that
any patent claim is infringed by making, using, selling, offering for
sale, or importing the Program or any portion of it.
#### 11. Patents.
A "contributor" is a copyright holder who authorizes use under this
License of the Program or a work on which the Program is based. The
work thus licensed is called the contributor's "contributor version".
A contributor's "essential patent claims" are all patent claims owned
or controlled by the contributor, whether already acquired or
hereafter acquired, that would be infringed by some manner, permitted
by this License, of making, using, or selling its contributor version,
but do not include claims that would be infringed only as a
consequence of further modification of the contributor version. For
purposes of this definition, "control" includes the right to grant
patent sublicenses in a manner consistent with the requirements of
this License. this License.
7. If, as a consequence of a court judgment or allegation of patent Each contributor grants you a non-exclusive, worldwide, royalty-free
infringement or for any other reason (not limited to patent issues), patent license under the contributor's essential patent claims, to
conditions are imposed on you (whether by court order, agreement or make, use, sell, offer for sale, import and otherwise run, modify and
propagate the contents of its contributor version.
In the following three paragraphs, a "patent license" is any express
agreement or commitment, however denominated, not to enforce a patent
(such as an express permission to practice a patent or covenant not to
sue for patent infringement). To "grant" such a patent license to a
party means to make such an agreement or commitment not to enforce a
patent against the party.
If you convey a covered work, knowingly relying on a patent license,
and the Corresponding Source of the work is not available for anyone
to copy, free of charge and under the terms of this License, through a
publicly available network server or other readily accessible means,
then you must either (1) cause the Corresponding Source to be so
available, or (2) arrange to deprive yourself of the benefit of the
patent license for this particular work, or (3) arrange, in a manner
consistent with the requirements of this License, to extend the patent
license to downstream recipients. "Knowingly relying" means you have
actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.
If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
receiving the covered work authorizing them to use, propagate, modify
or convey a specific copy of the covered work, then the patent license
you grant is automatically extended to all recipients of the covered
work and works based on it.
A patent license is "discriminatory" if it does not include within the
scope of its coverage, prohibits the exercise of, or is conditioned on
the non-exercise of one or more of the rights that are specifically
granted under this License. You may not convey a covered work if you
are a party to an arrangement with a third party that is in the
business of distributing software, under which you make payment to the
third party based on the extent of your activity of conveying the
work, and under which the third party grants, to any of the parties
who would receive the covered work from you, a discriminatory patent
license (a) in connection with copies of the covered work conveyed by
you (or copies made from those copies), or (b) primarily for and in
connection with specific products or compilations that contain the
covered work, unless you entered into that arrangement, or that patent
license was granted, prior to 28 March 2007.
Nothing in this License shall be construed as excluding or limiting
any implied license or other defenses to infringement that may
otherwise be available to you under applicable patent law.
#### 12. No Surrender of Others' Freedom.
If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot excuse you from the conditions of this License. If you cannot convey a
distribute so as to satisfy simultaneously your obligations under this covered work so as to satisfy simultaneously your obligations under
License and any other pertinent obligations, then as a consequence you this License and any other pertinent obligations, then as a
may not distribute the Program at all. For example, if a patent consequence you may not convey it at all. For example, if you agree to
license would not permit royalty-free redistribution of the Program by terms that obligate you to collect a royalty for further conveying
all those who receive copies directly or indirectly through you, then from those to whom you convey the Program, the only way you could
the only way you could satisfy both it and this License would be to satisfy both those terms and this License would be to refrain entirely
refrain entirely from distribution of the Program. from conveying the Program.
If any portion of this section is held invalid or unenforceable under #### 13. Use with the GNU Affero General Public License.
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other Notwithstanding any other provision of this License, you have
circumstances. permission to link or combine any covered work with a work licensed
under version 3 of the GNU Affero General Public License into a single
It is not the purpose of this section to induce you to infringe any combined work, and to convey the resulting work. The terms of this
patents or other property right claims or to contest validity of any License will continue to apply to the part which is the covered work,
such claims; this section has the sole purpose of protecting the but the special requirements of the GNU Affero General Public License,
integrity of the free software distribution system, which is section 13, concerning interaction through a network will apply to the
implemented by public license practices. Many people have made combination as such.
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that #### 14. Revised Versions of this License.
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot The Free Software Foundation may publish revised and/or new versions
impose that choice. of the GNU General Public License from time to time. Such new versions
will be similar in spirit to the present version, but may differ in
This section is intended to make thoroughly clear what is believed to detail to address new problems or concerns.
be a consequence of the rest of this License.
Each version is given a distinguishing version number. If the Program
8. If the distribution and/or use of the Program is restricted in specifies that a certain numbered version of the GNU General Public
certain countries either by patents or by copyrighted interfaces, the License "or any later version" applies to it, you have the option of
original copyright holder who places the Program under this License following the terms and conditions either of that numbered version or
may add an explicit geographical distribution limitation excluding of any later version published by the Free Software Foundation. If the
those countries, so that distribution is permitted only in or among Program does not specify a version number of the GNU General Public
countries not thus excluded. In such case, this License incorporates License, you may choose any version ever published by the Free
the limitation as if written in the body of this License. Software Foundation.
9. The Free Software Foundation may publish revised and/or new versions If the Program specifies that a proxy can decide which future versions
of the General Public License from time to time. Such new versions will of the GNU General Public License can be used, that proxy's public
be similar in spirit to the present version, but may differ in detail to statement of acceptance of a version permanently authorizes you to
address new problems or concerns. choose that version for the Program.
Each version is given a distinguishing version number. If the Program Later license versions may give you additional or different
specifies a version number of this License which applies to it and "any permissions. However, no additional obligations are imposed on any
later version", you have the option of following the terms and conditions author or copyright holder as a result of your choosing to follow a
either of that version or of any later version published by the Free later version.
Software Foundation. If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software #### 15. Disclaimer of Warranty.
Foundation.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
10. If you wish to incorporate parts of the Program into other free APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
programs whose distribution conditions are different, write to the author HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
to ask for permission. For software which is copyrighted by the Free WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
Software Foundation, write to the Free Software Foundation; we sometimes LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
make exceptions for this. Our decision will be guided by the two goals A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
of preserving the free status of all derivatives of our free software and PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
of promoting the sharing and reuse of software generally. DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
CORRECTION.
NO WARRANTY
#### 16. Limitation of Liability.
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM
REPAIR OR CORRECTION. TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR #### 17. Interpretation of Sections 15 and 16.
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING If the disclaimer of warranty and limitation of liability provided
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED above cannot be given local legal effect according to their terms,
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY reviewing courts shall apply local law that most closely approximates
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER an absolute waiver of all civil liability in connection with the
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE Program, unless a warranty or assumption of liability accompanies a
POSSIBILITY OF SUCH DAMAGES. copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs ### How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms. free software which everyone can redistribute and change under these
terms.
To do so, attach the following notices to the program. It is safest To do so, attach the following notices to the program. It is safest to
to attach them to the start of each source file to most effectively attach them to the start of each source file to most effectively state
convey the exclusion of warranty; and each file should have at least the exclusion of warranty; and each file should have at least the
the "copyright" line and a pointer to where the full notice is found. "copyright" line and a pointer to where the full notice is found.
{description} <one line to give the program's name and a brief idea of what it does.>
Copyright (C) {year} {fullname} Copyright (C) <year> <name of author>
This program is free software; you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or the Free Software Foundation, either version 3 of the License, or
(at your option) any later version. (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License along You should have received a copy of the GNU General Public License
with this program; if not, write to the Free Software Foundation, Inc., along with this program. If not, see <https://www.gnu.org/licenses/>.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail. Also add information on how to contact you by electronic and paper
mail.
If the program is interactive, make it output a short notice like this If the program does terminal interaction, make it output a short
when it starts in an interactive mode: notice like this when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) year name of author <program> Copyright (C) <year> <name of author>
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details. under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate The hypothetical commands \`show w' and \`show c' should show the
parts of the General Public License. Of course, the commands you use may appropriate parts of the General Public License. Of course, your
be called something other than `show w' and `show c'; they could even be program's commands might be different; for a GUI interface, you would
mouse-clicks or menu items--whatever suits your program. use an "about box".
You should also get your employer (if you work as a programmer) or your You should also get your employer (if you work as a programmer) or
school, if any, to sign a "copyright disclaimer" for the program, if school, if any, to sign a "copyright disclaimer" for the program, if
necessary. Here is a sample; alter the names: necessary. For more information on this, and how to apply and follow
the GNU GPL, see <https://www.gnu.org/licenses/>.
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
`Gnomovision' (which makes passes at compilers) written by James Hacker. The GNU General Public License does not permit incorporating your
program into proprietary programs. If your program is a subroutine
{signature of Ty Coon}, 1 April 1989 library, you may consider it more useful to permit linking proprietary
Ty Coon, President of Vice applications with the library. If this is what you want to do, use the
GNU Lesser General Public License instead of this License. But first,
This General Public License does not permit incorporating your program into please read <https://www.gnu.org/licenses/why-not-lgpl.html>.
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.

44
README.md

@ -4,18 +4,18 @@
**Tags:** publishing, catalog, pressbooks, default-theme **Tags:** publishing, catalog, pressbooks, default-theme
**Requires at least:** 4.9.1 **Requires at least:** 4.9.4
**Tested up to:** 4.9.1 **Tested up to:** 4.9.4
**Stable tag:** 1.0.0-beta.1 **Stable tag:** 1.0.0
**License:** GNU General Public License v2 or later **License:** GNU General Public License v3
**License URI:** LICENSE **License URI:** LICENSE
Aldine is the root theme for Pressbooks. Aldine is the default theme for the home page of Pressbooks networks. It is named for the Aldine Press, founded by Aldus Manutius in 1494, who is regarded by many as the world’s first publisher.
## Description ## Description
Aldine is the root theme for [Pressbooks](https://pressbooks.org), based on [Underscores](https://underscores.me/). Aldine is the default theme for the home page of [Pressbooks](https://pressbooks.org) networks. It is named for the Aldine Press, founded by Aldus Manutius in 1494, who is regarded by many as the world’s first publisher. Aldine is based on [Underscores](https://underscores.me/).
## Installation ## Installation
@ -32,38 +32,20 @@ TK.
## Changelog ## Changelog
### 1.0.0-beta.1
* Many changes; rebuilt on \_s. # Aldine 1.0.0
### 1.0.0-alpha6 #### Customisation & Branding
* **[FEATURE]** Add Per Soderlind's WCAG validator to customizer.
* **[FEATURE]** Add Thema subject support.
Aldine is the new default network theme for Pressbooks installations. Its creation was supported by [Ryerson University](https://ryerson.ca). Designed with customization in mind, it allows network managers to add institutional branding in the form of colours, logos and contact information, as well as custom content in blocks on the front page.
### 1.0.0-alpha5 #### Standalone Catalog
* **[CORE ENHANCEMENT]** Configure for use without Pressbooks (see #26).
In addition, Aldine introduces a standalone catalog page that is sortable and filterable by subject or license. Adding books to the catalog is controlled in the [same way as before](https://eduguide.pressbooks.com/chapter/catalogs/).
### 1.0.0-alpha4 #### Additional Pages
* **[CORE ENHANCEMENT]** Save `/dist` folder.
* **[FIX]** Add temporary fix for roots/sage-lib#2.
You can now more easily add additional pages to the network root, such as an “About Us” or “Help” page.
### 1.0.0-alpha3
* **[CORE ENHANCEMENT]** Move required theme files to root (see #24 and #25).
### 1.0.0-alpha2
* **[CORE ENHANCEMENT]** Optimize activation routine.
* **[FIX]** Remove extra wrapper on catalog and landing pages.
* **[FIX]** Resolve error when activating without active widgets.
### 1.0.0-alpha1
* Basic landing page implementation
* Basic catalog page implementation
* Basic customizer capabilities
## Credits ## Credits

BIN
assets/images/header.jpg

Binary file not shown.

Before

Width:  |  Height:  |  Size: 176 KiB

After

Width:  |  Height:  |  Size: 240 KiB

45
assets/scripts/catalog-admin.js

@ -0,0 +1,45 @@
/* global ajaxurl, PB_Aldine_Admin */
( function ( $ ) {
$( document ).ready( function () {
$( '.wrap' ).on( 'click', '.notice-dismiss', function () {
$( this ).parent( '#message' ).fadeOut( 500, function () {
$( this ).remove();
} );
} );
$( 'input.in-catalog' ).on( 'change', function () {
let book_id = $( this ).parent( 'td' ).siblings( 'th' ).children( 'input' ).val();
let in_catalog = $( this ).prop( 'checked' );
$.ajax( {
url: ajaxurl,
type: 'POST',
data: {
action: 'pressbooks_aldine_update_catalog',
book_id: book_id,
in_catalog: in_catalog,
_ajax_nonce: PB_Aldine_Admin.aldineAdminNonce,
},
success: function (){
if ( $( '#message' ).length < 1 ) {
$( '<div id="message" class="updated notice is-dismissible">' ).html( '<p><strong>'+PB_Aldine_Admin.catalog_updated+'</strong></p><button type="button" class="notice-dismiss"><span class="screen-reader-text">'+PB_Aldine_Admin.dismiss_notice+'</span></button>' ).hide().insertAfter( '.wrap h1' ).fadeIn( 500 );
} else {
$( '#message' ).fadeOut( 500, function () {
$( this ).remove();
$( '<div id="message" class="updated notice is-dismissible">' ).html( '<p><strong>'+PB_Aldine_Admin.catalog_updated+'</strong></p><button type="button" class="notice-dismiss"><span class="screen-reader-text">'+PB_Aldine_Admin.dismiss_notice+'</span></button>' ).hide().insertAfter( '.wrap h1' ).fadeIn( 500 );
} );
}
},
error: function ( jqXHR, textStatus, errorThrown ) {
if ( $( '#message' ).length < 1 ) {
$( '<div id="message" class="error notice is-dismissible">' ).html( '<p><strong>'+PB_Aldine_Admin.catalog_not_updated+'</strong></p><button type="button" class="notice-dismiss"><span class="screen-reader-text">'+PB_Aldine_Admin.dismiss_notice+'</span></button>' ).hide().insertAfter( '.wrap h1' ).fadeIn( 500 );
} else {
$( '#message' ).fadeOut( 500, function () {
$( this ).remove();
$( '<div id="message" class="error notice is-dismissible">' ).html( '<p><strong>'+PB_Aldine_Admin.catalog_not_updated+'</strong></p><button type="button" class="notice-dismiss"><span class="screen-reader-text">'+PB_Aldine_Admin.dismiss_notice+'</span></button>' ).hide().insertAfter( '.wrap h1' ).fadeIn( 500 );
} );
}
},
} );
} );
} );
} )( jQuery );

8
assets/styles/aldine.scss

@ -12,7 +12,9 @@
@import "common/global"; @import "common/global";
@import "components/book"; @import "components/book";
@import "components/forms"; @import "components/forms";
@import "layouts/footer";
@import "layouts/header"; @import "layouts/header";
@import "layouts/front-page"; @import "layouts/page";
@import "layouts/pages"; @import "layouts/page-home";
@import "layouts/catalog"; @import "layouts/page-catalog";
@import "layouts/signup";

17
assets/styles/components/_book.scss

@ -1,22 +1,23 @@
.book { .book {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: flex-start;
width: 100%; width: 100%;
max-width: 22.9375rem; max-width: 22.9375rem;
height: 24.125rem; height: 24.125rem;
margin: 0 0 2rem; margin: 0 0 2rem;
padding: 1.5rem 1rem 2rem; padding: 1.5rem 1rem 2rem;
@media #{$breakpoint-not-small} { padding: 1.5rem 1.85rem 2.1875rem; } @media #{$breakpoint-not-small} { padding: 1.5rem 1.85rem 2.1875rem; }
border: solid 2px var(--accent, $brand-accent); border: solid 2px var(--accent);
background: var(--accent, $brand-accent); background: var(--accent);
a { a {
margin: 0; margin: 0;
font-family: $font-family-sans-serif; font-family: $font-family-sans-serif;
color: var(--accent-fg, #fff); color: var(--accent-fg);
text-decoration: none; text-decoration: none;
text-align: center; text-align: center;
hyphens: auto;
} }
&__title { &__title {
@ -30,13 +31,15 @@
&__subject { &__subject {
margin: 0; margin: 0;
font-size: 0.8rem; font-size: 0.75rem;
@media #{$breakpoint-not-small} { font-size: 1.25rem; } @media #{$breakpoint-not-small} {
font-size: 1rem;
}
text-align: left; text-align: left;
} }
&__read-more { &__read-more {
margin: 0; margin: auto 0 0;
font-size: 1rem; font-size: 1rem;
@media #{$breakpoint-not-small} { font-size: 1.125rem; } @media #{$breakpoint-not-small} { font-size: 1.125rem; }
text-align: left; text-align: left;

14
assets/styles/components/_forms.scss

@ -16,7 +16,7 @@ textarea {
border-top: 0; border-top: 0;
border-right: 0; border-right: 0;
border-left: 0; border-left: 0;
border-bottom: solid 2px var(--black, #000); border-bottom: solid 2px var(--body-text);
border-radius: 0; border-radius: 0;
padding: 0 0 1.5em; padding: 0 0 1.5em;
font-size: 1rem; font-size: 1rem;
@ -40,7 +40,7 @@ input[type="submit"] {
width: rem(354); width: rem(354);
::placeholder { ::placeholder {
color: #000; color: var(--black);
} }
&__notice { &__notice {
@ -52,11 +52,11 @@ input[type="submit"] {
text-align: center; text-align: center;
&--error { &--error {
color: #c00; color: var(--error);
} }
&--success { &--success {
color: #070; color: var(--success);
} }
} }
@ -89,10 +89,10 @@ input[type="submit"] {
} }
} }
&.error { &.error {
border-bottom: solid 2px #c00; border-bottom: solid 2px var(--error);
+ label { + label {
color: #c00; color: var(--error);
} }
} }
} }
@ -112,7 +112,7 @@ input[type="submit"] {
align-items: center; align-items: center;
width: 100%; width: 100%;
padding: rem(65) 0 rem(120); padding: rem(65) 0 rem(120);
background: #f6f6f6; background: var(--body-bg-alt);
h2 { h2 {
margin-bottom: rem(40); margin-bottom: rem(40);

3
assets/styles/editor.scss

@ -1,7 +1,8 @@
@import '~aetna/assets/styles/common/_variables.scss'; @import '~aetna/assets/styles/common/_variables.scss';
@import '~aetna/assets/styles/common/_global.scss'; @import '~aetna/assets/styles/common/_global.scss';
#tinymce.wp-editor { body#tinymce {
margin: 12px !important;
@import '~aetna/assets/styles/components/_buttons.scss'; @import '~aetna/assets/styles/components/_buttons.scss';
@import '~aetna/assets/styles/layouts/_page-sections.scss'; @import '~aetna/assets/styles/layouts/_page-sections.scss';
} }

0
assets/styles/layouts/_posts.scss → assets/styles/layouts/_footer.scss

9
assets/styles/layouts/_header.scss

@ -12,6 +12,10 @@
@media #{$breakpoint-large} { @media #{$breakpoint-large} {
height: 880px; height: 880px;
.header__inside {
position: relative;
z-index: 99;
}
} }
} }
@ -31,8 +35,8 @@
height: 540px; height: 540px;
@media #{$breakpoint-large} { @media #{$breakpoint-large} {
height: 300px; height: 160px;
margin: 120px 0; margin: 80px 0 0;
} }
.entry-title { .entry-title {
@ -49,6 +53,7 @@
.entry-description { .entry-description {
font-family: $font-family-sans-serif; font-family: $font-family-sans-serif;
font-size: 1.125rem; font-size: 1.125rem;
margin-top: 0;
margin-bottom: 0; margin-bottom: 0;
text-align: center; text-align: center;
max-width: 100%; max-width: 100%;

33
assets/styles/layouts/_catalog.scss → assets/styles/layouts/_page-catalog.scss

@ -55,7 +55,7 @@ fieldset {
h2 { h2 {
[aria-expanded="true"] { [aria-expanded="true"] {
border-bottom: solid 2px var(--accent); border-bottom: solid 2px var(--accent);
background: #fafdff; background: var(--body-bg-alt);
} }
} }
@ -145,7 +145,7 @@ fieldset {
font-family: $font-family-sans-serif; font-family: $font-family-sans-serif;
a { a {
color: #000; color: var(--body-text);
&:hover, &:hover,
&:focus { &:focus {
@ -190,7 +190,7 @@ fieldset {
} }
} }
@media #{$breakpoint-tablet-and-up} { @media #{$breakpoint-medium} {
.filter-sort { .filter-sort {
width: calc(100% - 1rem); width: calc(100% - 1rem);
height: 7rem; height: 7rem;
@ -249,27 +249,18 @@ fieldset {
@media #{$breakpoint-large} { @media #{$breakpoint-large} {
.catalog #content { .catalog #content {
width: 100%; width: calc(100% - 1rem);
max-width: rem(1440); margin-left: auto;
background: transparent; margin-right: auto;
}
.catalog .book {
max-width: calc(100% / 3 - 1rem);
}
}
@media #{$breakpoint-extra-large} {
.catalog #content {
width: 100%;
max-width: rem(1650); max-width: rem(1650);
background: transparent;
} }
.filter-sort { .filter-sort {
width: calc(25% - 1rem); width: calc(25% - 2rem);
height: auto; height: auto;
float: left; float: left;
margin-left: 0; margin: 2rem 1rem 1rem;
} }
fieldset { fieldset {
@ -294,6 +285,12 @@ fieldset {
margin-left: 0; margin-left: 0;
} }
.catalog .book {
height: 16.25rem;
max-width: calc(100% / 3 - 1rem);
margin: 0 1rem 1rem 0;
}
.catalog-navigation { .catalog-navigation {
width: 75%; width: 75%;
float: right; float: right;

2
assets/styles/layouts/_front-page.scss → assets/styles/layouts/_page-home.scss

@ -56,7 +56,7 @@
margin-top: 0; margin-top: 0;
path { path {
fill: var(--primary, $brand); fill: var(--primary);
} }
} }
} }

0
assets/styles/layouts/_sidebar.scss → assets/styles/layouts/_page.scss

13
assets/styles/layouts/_pages.scss

@ -1,13 +0,0 @@
// .page:not(.home) article {
// .entry-header h1 {
// @extend .h2;
// }
// @extend .page-section;
// text-align: left;
// width: 100%;
// max-width: rem(800);
// margin-top: calc(-80%);
// margin-left: auto;
// margin-right: auto;
// }

42
assets/styles/layouts/_signup.scss

@ -0,0 +1,42 @@
.mu_register.wp-signup-container {
@extend .page-section;
margin: rem(120) auto 0;
display: flex;
flex-direction: column;
* {
text-align: left;
}
h2 {
text-align: center;
order: -1;
}
.mu_alert {
margin-bottom: 2rem;
}
form {
margin-top: 0;
}
input:not([type="submit"]) {
padding: 0;
}
.checkbox {
margin-right: 1em;
}
.submit {
text-align: center;
}
[type="submit"] {
width: auto;
margin: 0 auto;
text-align: center;
}
}

3
assets/styles/layouts/_tinymce.scss

@ -1,3 +0,0 @@
body#tinymce {
margin: 12px !important;
}

8
composer.json

@ -1,8 +1,9 @@
{ {
"name": "pressbooks/pressbooks-aldine", "name": "pressbooks/pressbooks-aldine",
"type": "wordpress-theme", "type": "wordpress-theme",
"license": "GPL-2.0-or-later", "license": "GPL-3.0",
"description": "Aldine is the root theme for Pressbooks.", "description":
"Aldine is the default theme for the home page of Pressbooks networks. It is named for the Aldine Press, founded by Aldus Manutius in 1494, who is regarded by many as the world’s first publisher.",
"homepage": "https://github.com/pressbooks/pressbooks-aldine/", "homepage": "https://github.com/pressbooks/pressbooks-aldine/",
"authors": [ "authors": [
{ {
@ -20,7 +21,8 @@
"php": ">=7", "php": ">=7",
"composer/installers": "~1.0", "composer/installers": "~1.0",
"pressbooks/mix": "^2.1", "pressbooks/mix": "^2.1",
"soberwp/intervention": "1.2.0-p" "soberwp/intervention": "1.2.0-p",
"spatie/color": "^1.1"
}, },
"require-dev": { "require-dev": {
"humanmade/coding-standards": "^0.2.1", "humanmade/coding-standards": "^0.2.1",

50
composer.lock generated

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "6a3f76d94f447a4cac0b1b48e01e07d0", "content-hash": "edad2ef6112644b56c39a416914d8b0f",
"packages": [ "packages": [
{ {
"name": "composer/installers", "name": "composer/installers",
@ -209,6 +209,54 @@
"wordpress" "wordpress"
], ],
"time": "2017-08-26T12:21:27+00:00" "time": "2017-08-26T12:21:27+00:00"
},
{
"name": "spatie/color",
"version": "1.1.1",
"source": {
"type": "git",
"url": "https://github.com/spatie/color.git",
"reference": "5c424dbfa919cc7acdacbf6fdcedb89f790bc04b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/spatie/color/zipball/5c424dbfa919cc7acdacbf6fdcedb89f790bc04b",
"reference": "5c424dbfa919cc7acdacbf6fdcedb89f790bc04b",
"shasum": ""
},
"require": {
"php": "^7.0"
},
"require-dev": {
"phpunit/phpunit": "5.*"
},
"type": "library",
"autoload": {
"psr-4": {
"Spatie\\Color\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Sebastian De Deyne",
"email": "sebastian@spatie.be",
"homepage": "https://spatie.be",
"role": "Developer"
}
],
"description": "A little library to handle color conversions",
"homepage": "https://github.com/spatie/color",
"keywords": [
"color",
"conversion",
"rgb",
"spatie"
],
"time": "2017-02-03T10:05:49+00:00"
} }
], ],
"packages-dev": [ "packages-dev": [

BIN
dist/images/header.jpg vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 176 KiB

After

Width:  |  Height:  |  Size: 240 KiB

9
dist/mix-manifest.json vendored

@ -1,6 +1,7 @@
{ {
"/scripts/aldine.js": "/scripts/aldine.js?id=a166171314fdc227903c", "/scripts/aldine.js": "/scripts/aldine.js?id=1f58027f7de9942caf57",
"/styles/aldine.css": "/styles/aldine.css?id=00b0c10d93f464c01cc5", "/styles/aldine.css": "/styles/aldine.css?id=bd38b94fc99f5bf65198",
"/styles/editor.css": "/styles/editor.css?id=10e3f4b144847aa8d75e", "/styles/editor.css": "/styles/editor.css?id=e96b3d10ea63fa07d09b",
"/scripts/customizer.js": "/scripts/customizer.js?id=decf119933e3b2d4b210" "/scripts/customizer.js": "/scripts/customizer.js?id=1b0d3cfc1d85f460af53",
"/scripts/catalog-admin.js": "/scripts/catalog-admin.js?id=d25f1240496bd3607338"
} }

2
dist/scripts/aldine.js vendored

File diff suppressed because one or more lines are too long

1
dist/scripts/catalog-admin.js vendored

File diff suppressed because one or more lines are too long

2
dist/scripts/customizer.js vendored

File diff suppressed because one or more lines are too long

2
dist/styles/aldine.css vendored

File diff suppressed because one or more lines are too long

2
dist/styles/editor.css vendored

File diff suppressed because one or more lines are too long

55
functions.php

@ -10,7 +10,7 @@
/** /**
* Ensure dependencies are loaded * Ensure dependencies are loaded
*/ */
if ( ! class_exists( 'PressbooksMix\\Assets' ) ) { if ( ! class_exists( 'Spatie\\Color\\Hex' ) ) {
$composer = get_template_directory() . '/vendor/autoload.php'; $composer = get_template_directory() . '/vendor/autoload.php';
if ( ! file_exists( $composer ) ) { if ( ! file_exists( $composer ) ) {
wp_die( sprintf( wp_die( sprintf(
@ -25,9 +25,11 @@ if ( ! class_exists( 'PressbooksMix\\Assets' ) ) {
$includes = [ $includes = [
'actions', 'actions',
'activation', 'activation',
'admin',
'customizer', 'customizer',
'filters', 'filters',
'helpers', 'helpers',
'shortcodes',
'tags', 'tags',
]; ];
@ -36,21 +38,36 @@ foreach ( $includes as $include ) {
} }
require get_template_directory() . '/inc/intervention.php'; require get_template_directory() . '/inc/intervention.php';
add_action( 'after_switch_theme', '\\Aldine\\Activation\\create_default_content', 10 ); add_action( 'after_switch_theme', '\Aldine\Activation\create_default_content', 10 );
add_action( 'after_switch_theme', '\\Aldine\\Activation\\create_menus', 11 ); add_action( 'after_switch_theme', '\Aldine\Activation\create_menus', 11 );
add_action( 'after_switch_theme', '\\Aldine\\Activation\\assign_menus', 12 ); add_action( 'after_switch_theme', '\Aldine\Activation\assign_menus', 12 );
add_action( 'admin_bar_init', '\\Aldine\\Actions\\remove_admin_bar_callback' ); add_action( 'admin_bar_init', '\Aldine\Actions\remove_admin_bar_callback' );
add_action( 'after_setup_theme', '\\Aldine\\Actions\\setup' ); add_action( 'after_setup_theme', '\Aldine\Actions\setup' );
add_action( 'after_setup_theme', '\\Aldine\\Actions\\content_width', 0 ); add_action( 'after_setup_theme', '\Aldine\Actions\content_width', 0 );
add_action( 'wp_head', '\\Aldine\\Actions\\output_custom_colors' ); add_action( 'wp_head', '\Aldine\Actions\output_custom_colors' );
add_action( 'init', '\\Aldine\\Actions\\add_editor_styles' ); add_action( 'init', '\Aldine\Actions\add_editor_styles' );
add_filter( 'mce_buttons', '\\Aldine\\Filters\\add_style_select' ); add_action( 'admin_init', '\Aldine\Actions\hide_catalog_content_editor' );
add_filter( 'tiny_mce_before_init', '\\Aldine\\Filters\\add_blocks' ); add_filter( 'mce_buttons', '\Aldine\Filters\add_style_select' );
add_filter( 'body_class', '\\Aldine\\Filters\\body_classes' ); add_filter( 'tiny_mce_before_init', '\Aldine\Filters\add_blocks' );
add_filter( 'excerpt_more', '\\Aldine\\Filters\\excerpt_more' ); add_filter( 'body_class', '\Aldine\Filters\body_classes' );
add_filter( 'query_vars', '\\Aldine\\Filters\\register_query_vars' ); add_filter( 'excerpt_more', '\Aldine\Filters\excerpt_more' );
add_filter( 'wp_nav_menu_items', '\\Aldine\\Filters\\adjust_menu', 10, 2 ); add_filter( 'query_vars', '\Aldine\Filters\register_query_vars' );
add_action( 'widgets_init', '\\Aldine\\Actions\\widgets_init' ); add_filter( 'wp_nav_menu_items', '\Aldine\Filters\adjust_menu', 10, 2 );
add_action( 'wp_enqueue_scripts', '\\Aldine\\Actions\\enqueue_assets' ); add_filter( 'the_content', 'do_shortcode' );
add_action( 'customize_register', '\\Aldine\\Customizer\\customize_register' ); add_action( 'widgets_init', '\Aldine\Actions\widgets_init' );
add_action( 'customize_preview_init', '\\Aldine\\Customizer\\customize_preview_js' ); add_action( 'wp_enqueue_scripts', '\Aldine\Actions\enqueue_assets' );
add_action( 'updated_option', '\Aldine\Actions\add_color_variants', 10, 3 );
add_action( 'customize_register', '\Aldine\Customizer\customize_register' );
add_action( 'customize_preview_init', '\Aldine\Customizer\customize_preview_js' );
add_action( 'customize_controls_enqueue_scripts', '\Aldine\Customizer\enqueue_color_contrast_validator' );
// Shortcodes
add_shortcode( 'aldine_page_section', '\Aldine\Shortcodes\page_section' );
add_shortcode( 'aldine_call_to_action', '\Aldine\Shortcodes\call_to_action' );
// Catalog page: Network admin controls
add_action( 'admin_enqueue_scripts', '\Aldine\Admin\admin_scripts' );
add_action( 'wp_ajax_pressbooks_aldine_update_catalog', '\Aldine\Admin\update_catalog' );
add_filter( 'wpmu_blogs_columns', '\Aldine\Admin\catalog_columns' );
add_action( 'manage_blogs_custom_column', '\Aldine\Admin\catalog_column', 1, 3 );
add_action( 'manage_sites_custom_column', '\Aldine\Admin\catalog_column', 1, 3 );

2
header.php

@ -81,4 +81,4 @@
</div> </div>
</header> <!-- .header --> </header> <!-- .header -->
<div id="content" class="site-content"> <div id="content" class="site-content clearfix">

98
inc/actions/namespace.php

@ -6,6 +6,9 @@
namespace Aldine\Actions; namespace Aldine\Actions;
use Spatie\Color\Hex;
use Spatie\Color\Rgb;
use Spatie\Color\Rgba;
use PressbooksMix\Assets; use PressbooksMix\Assets;
/** /**
@ -165,35 +168,38 @@ function content_width() {
* @return void * @return void
*/ */
function output_custom_colors() { function output_custom_colors() {
$colors = [ if ( defined( 'PB_PLUGIN_VERSION' ) ) {
'primary', echo \Pressbooks\Admin\Branding\get_customizer_colors();
'accent', } else {
'primary_fg', $colors = [
'accent_fg', 'primary',
'header_text', 'accent',
]; 'primary_fg',
'accent_fg',
$values = []; 'primary_dark',
'accent_dark',
foreach ( $colors as $k ) { 'primary_alpha',
$v = get_option( "pb_network_color_$k" ); 'accent_alpha',
if ( $v ) { 'header_text',
$values[ $k ] = $v; ];
$values = [];
foreach ( $colors as $k ) {
$v = get_option( "pb_network_color_$k" );
if ( $v ) {
$values[ $k ] = $v;
}
} }
} $output = '';
if ( ! empty( $values ) ) {
$output = ''; $output .= '<style type="text/css">:root{';
foreach ( $values as $k => $v ) {
if ( ! empty( $values ) ) { $k = str_replace( '_', '-', $k );
$output .= '<style type="text/css">:root{'; $output .= "--$k:$v;";
foreach ( $values as $k => $v ) { }
$k = str_replace( '_', '-', $k ); $output .= '}</style>';
$output .= "--$k:$v;";
} }
$output .= '}</style>'; echo $output;
} }
echo $output;
} }
/** /**
@ -202,3 +208,43 @@ function output_custom_colors() {
function remove_admin_bar_callback() { function remove_admin_bar_callback() {
remove_action( 'wp_head', '_admin_bar_bump_cb' ); remove_action( 'wp_head', '_admin_bar_bump_cb' );
} }
/**
* Hide content editor for Catalog page.
*/
function hide_catalog_content_editor() {
$post_id = $_GET['post'] ?? null ;
if ( ! isset( $post_id ) ) {
return;
}
$pagename = get_the_title( $post_id );
if ( $pagename === 'Catalog' ) {
add_action( 'edit_form_after_title', function() {
printf( '<p>%s</p>', __( 'This page displays your network catalog, so there is no content to edit.', 'pressbooks-aldine' ) );
} );
remove_post_type_support( 'page', 'editor' );
remove_post_type_support( 'page', 'thumbnail' );
}
}
/**
* Add dark and alpha variants for customizer colors on update.
*
* @since 1.0.0
*/
function add_color_variants( $option, $old_value, $value ) {
if ( ! in_array( $option, [ 'pb_network_color_primary', 'pb_network_color_accent' ], true ) ) {
return;
}
$color = Hex::fromString( $value );
$color = $color->toRgb();
$color_alpha = $color->toRgba( 0.25 );
$color_dark = new Rgb(
$color->red() * 0.9,
$color->green() * 0.9,
$color->blue() * 0.9
);
update_option( $option . '_dark', (string) $color_dark );
update_option( $option . '_alpha', (string) $color_alpha );
}

5
inc/activation/namespace.php

@ -97,6 +97,11 @@ function create_default_content() {
wp_delete_post( 2, true ); wp_delete_post( 2, true );
wp_delete_comment( 1, true ); wp_delete_comment( 1, true );
// Migrate site logo
if ( ! empty( $mods['custom_logo'] ) ) {
set_theme_mod( 'custom_logo', $mods['custom_logo'] );
}
// Add "pb_aldine_activated" option to enable check above // Add "pb_aldine_activated" option to enable check above
add_option( 'pb_aldine_activated', 1 ); add_option( 'pb_aldine_activated', 1 );
} }

76
inc/admin/namespace.php

@ -0,0 +1,76 @@
<?php
/**
* @package Aldine
*/
namespace Aldine\Admin;
use PressbooksMix\Assets;
/**
* Uses old option to provide a simpler upgrade path from pressbooks-publisher theme
*/
const BLOG_OPTION = 'pressbooks_publisher_in_catalog';
/**
* @param string $hook
*/
function admin_scripts( $hook ) {
if ( 'sites.php' !== $hook ) {
return;
}
$assets = new Assets( 'pressbooks-aldine', 'theme' );
$assets->setSrcDirectory( 'assets' )->setDistDirectory( 'dist' );
wp_enqueue_script( 'pressbooks-aldine-admin', $assets->getPath( 'scripts/catalog-admin.js' ), [ 'jquery' ] );
wp_localize_script(
'pressbooks-aldine-admin', 'PB_Aldine_Admin', [
'aldineAdminNonce' => wp_create_nonce( 'pressbooks-aldine-admin' ),
'catalog_updated' => __( 'Catalog updated.', 'pressbooks-aldine' ),
'catalog_not_updated' => __( 'Sorry, but your catalog was not updated. Please try again.', 'pressbooks-aldine' ),
'dismiss_notice' => __( 'Dismiss this notice.', 'pressbooks-aldine' ),
]
);
}
/**
*
*/
function update_catalog() {
if ( ! current_user_can( 'manage_network' ) || ! check_ajax_referer( 'pressbooks-aldine-admin' ) ) {
return;
}
$blog_id = absint( $_POST['book_id'] );
$in_catalog = $_POST['in_catalog'];
if ( $in_catalog === 'true' ) {
update_blog_option( $blog_id, \Aldine\Admin\BLOG_OPTION, 1 );
} else {
delete_blog_option( $blog_id, \Aldine\Admin\BLOG_OPTION );
}
}
/**
* @param array $columns
*
* @return array
*/
function catalog_columns( $columns ) {
$columns['in_catalog'] = __( 'In Catalog', 'pressbooks-aldine' );
return $columns;
}
/**
* @param string $column
* @param int $blog_id
*/
function catalog_column( $column, $blog_id ) {
if ( 'in_catalog' === $column && ! is_main_site( $blog_id ) ) { ?>
<input class="in-catalog" type="checkbox" name="in_catalog" value="1" aria-label="<?php echo esc_attr_x( 'Show in Catalog', 'pressbooks-aldine' ); ?>" <?php checked( get_blog_option( $blog_id, \Aldine\Admin\BLOG_OPTION ), 1 ); ?> <?php
if ( ! get_blog_option( $blog_id, 'blog_public' ) ) { ?>disabled="disabled" title="<?php echo esc_attr_x( 'This book is private, so you can&rsquo;t display it in your catalog.', 'pressbooks-aldine' ); ?>"<?php } ?> />
<?php }
}

50
inc/customizer/namespace.php

@ -12,9 +12,17 @@ use PressbooksMix\Assets;
/** /**
* Add postMessage support for site title and description for the Theme Customizer. * Add postMessage support for site title and description for the Theme Customizer.
* *
* @param WP_Customize_Manager $wp_customize Theme Customizer object. * @param \WP_Customize_Manager $wp_customize Theme Customizer object.
*/ */
function customize_register( \WP_Customize_Manager $wp_customize ) { function customize_register( \WP_Customize_Manager $wp_customize ) {
// Remove unsupported WP controls, @see \WP_Customize_Manager::register_controls
$wp_customize->remove_control( 'display_header_text' );
$wp_customize->remove_control( 'header_textcolor' );
// Add Pressbooks controls
$wp_customize->get_setting( 'blogname' )->transport = 'postMessage'; $wp_customize->get_setting( 'blogname' )->transport = 'postMessage';
$wp_customize->get_setting( 'blogdescription' )->transport = 'postMessage'; $wp_customize->get_setting( 'blogdescription' )->transport = 'postMessage';
$wp_customize->get_setting( 'header_textcolor' )->transport = 'postMessage'; $wp_customize->get_setting( 'header_textcolor' )->transport = 'postMessage';
@ -169,18 +177,30 @@ function customize_preview_js() {
$assets->setSrcDirectory( 'assets' )->setDistDirectory( 'dist' ); $assets->setSrcDirectory( 'assets' )->setDistDirectory( 'dist' );
wp_enqueue_script( 'aldine/customizer', $assets->getPath( 'scripts/customizer.js' ), [ 'customize-preview' ], false, null ); wp_enqueue_script( 'aldine/customizer', $assets->getPath( 'scripts/customizer.js' ), [ 'customize-preview' ], false, null );
// TODO @codingStandardsIgnoreStart }
// wp_enqueue_script( 'wcag-validate-customizer-color-contrast', get_template_directory_uri() . '/lib/customizer-validate-wcag-color-contrast/customizer-validate-wcag-color-contrast.js', [ 'customize-controls' ] );
/**
// $exports = [ * @see https://github.com/soderlind/customizer-validate-wcag-color-contrast
// 'validate_color_contrast' => [ */
// 'pb_network_color_primary_fg' => [ 'pb_network_color_primary' ], function enqueue_color_contrast_validator() {
// 'pb_network_color_accent_fg' => [ 'pb_network_color_accent' ], $handle = 'wcag-validate-customizer-color-contrast';
// ],
// ]; wp_enqueue_script(
// wp_scripts()->add_data( $handle,
// 'wcag-validate-customizer-color-contrast', get_template_directory_uri() . '/lib/customizer-validate-wcag-color-contrast/customizer-validate-wcag-color-contrast.js',
// 'data', [ 'customize-controls' ]
// sprintf( 'var _validateWCAGColorContrastExports = %s;', wp_json_encode( $exports ) ) );
// ); // @codingStandardsIgnoreEnd
$exports = [
'validate_color_contrast' => [
'pb_network_color_primary_fg' => [ 'pb_network_color_primary' ],
'pb_network_color_accent_fg' => [ 'pb_network_color_accent' ],
],
];
wp_scripts()->add_data(
$handle,
'data',
sprintf( 'var _validateWCAGColorContrastExports = %s;', wp_json_encode( $exports ) )
);
} }

130
inc/helpers/namespace.php

@ -7,49 +7,91 @@
namespace Aldine\Helpers; namespace Aldine\Helpers;
use Pressbooks\Licensing; use Pressbooks\Book;
use function \Pressbooks\Metadata\book_information_to_schema;
/** /**
* Get catalog data.
*
* @param int $page * @param int $page
* @param int $per_page * @param int $per_page
* @param string $orderby * @param string $orderby
* @param string $license * @param string $license
* @param string $subject * @param string $subject
*
* @return array
*/ */
function get_catalog_data( $page = 1, $per_page = 10, $orderby = 'title', $license = '', $subject = '' ) { function get_catalog_data( $page = 1, $per_page = 10, $orderby = 'title', $license = '', $subject = '' ) {
if ( defined( 'PB_PLUGIN_VERSION' ) ) {
$request = new \WP_REST_Request( 'GET', '/pressbooks/v2/books' ); if ( ! defined( 'PB_PLUGIN_VERSION' ) ) {
$request->set_query_params([ return [ 'pages' => 0, 'books' => [] ]; // Bail
'page' => $page, }
'per_page' => $per_page,
]); /**
$response = rest_do_request( $request ); * Filter the WP_Site_Query args for the catalog display.
$pages = $response->headers['X-WP-TotalPages']; *
$data = rest_get_server()->response_to_data( $response, true ); * @since 1.0.0
$books = []; */
foreach ( $data as $key => $book ) { $args = apply_filters(
$book['title'] = $book['metadata']['name']; 'pb_aldine_catalog_query_args',
$book['date-published'] = ( isset( $book['metadata']['datePublished'] ) ) ? /**
$book['metadata']['datePublished'] : * @deprecated 1.0.0
''; *
$book['subject'] = ( isset( $book['metadata']['about'][0] ) ) * @see Pressbooks Publisher
? $book['metadata']['about'][0]['identifier'] */
: ''; apply_filters(
$books[] = $book; 'pb_publisher_catalog_query_args',
} [
if ( $orderby === 'latest' ) { 'public' => '1',
$books = wp_list_sort( $books, $orderby, 'desc' ); 'network_id' => get_network()->site_id,
} else { ]
$books = wp_list_sort( $books, $orderby ); )
);
/** @var \WP_Site $site */
$sites_in_catalog = [];
$sites = new \WP_Site_Query( $args );
foreach ( $sites->sites as $site ) {
// TODO: Using switch_to_blog() is a performance problem. Use [ https://core.trac.wordpress.org/ticket/37923 ] when available.
switch_to_blog( $site->blog_id );
if ( get_option( \Aldine\Admin\BLOG_OPTION ) ) {
$site->pb_title = get_bloginfo( 'name' ); // Cool hack! :face_with_rolling_eyes:
$sites_in_catalog[] = $site;
} }
return [ 'pages' => $pages, 'books' => $books ]; restore_current_blog();
}
if ( $orderby === 'latest' ) {
$sites_in_catalog = wp_list_sort( $sites_in_catalog, 'last_updated', 'DESC' );
} else { } else {
return [ 'pages' => 0, 'books' => [] ]; $sites_in_catalog = wp_list_sort( $sites_in_catalog, 'pb_title', 'ASC' );
} }
$total_pages = ceil( count( $sites_in_catalog ) / $per_page );
$offset = ( $page - 1 ) * $per_page;
$books = [];
foreach ( $sites_in_catalog as $i => $site ) {
if ( $i < $offset ) {
continue;
}
switch_to_blog( $site->blog_id );
$schema = book_information_to_schema( Book::getBookInformation() );
$book['title'] = $schema['name'];
$book['date-published'] = $schema['datePublished'] ?? '';
$book['subject'] = $schema['about'][0]['identifier'] ?? '';
$book['link'] = get_blogaddress_by_id( $site->blog_id );
$book['metadata'] = $schema;
$books[] = $book;
restore_current_blog();
if ( count( $books ) >= $per_page ) {
break;
}
}
return [ 'pages' => $total_pages, 'books' => $books ];
} }
/** /**
* Get licenses for catalog display. * Get licenses for catalog display.
* *
@ -70,6 +112,7 @@ function get_catalog_licenses() {
* Get licenses currently in use. * Get licenses currently in use.
* *
* @param array $catalog_data * @param array $catalog_data
*
* @return array * @return array
*/ */
function get_available_licenses( $catalog_data ) { function get_available_licenses( $catalog_data ) {
@ -90,6 +133,7 @@ function get_available_licenses( $catalog_data ) {
* Get subjects currently in use. * Get subjects currently in use.
* *
* @param array $catalog_data * @param array $catalog_data
*
* @return array * @return array
*/ */
function get_available_subjects( $catalog_data ) { function get_available_subjects( $catalog_data ) {
@ -107,6 +151,7 @@ function get_available_subjects( $catalog_data ) {
* Return the default (non-page) menu items. * Return the default (non-page) menu items.
* *
* @param string $items * @param string $items
*
* @return string $items * @return string $items
*/ */
function get_default_menu( $items = '' ) { function get_default_menu( $items = '' ) {
@ -144,6 +189,14 @@ function get_default_menu( $items = '' ) {
__( 'Admin', 'pressbooks-aldine' ) __( 'Admin', 'pressbooks-aldine' )
); );
} }
$user_info = get_userdata( get_current_user_id() );
if ( $user_info->primary_blog ) {
$items .= sprintf(
'<li><a href="%1$s">%2$s</a></li>',
get_blogaddress_by_id( $user_info->primary_blog ) . 'wp-admin/index.php?page=pb_catalog',
__( 'My Books', 'pressbooks-aldine' )
);
}
$items .= sprintf( $items .= sprintf(
'<li><a href="%1$s">%2$s</a></li>', '<li><a href="%1$s">%2$s</a></li>',
wp_logout_url( get_permalink() ), wp_logout_url( get_permalink() ),
@ -151,9 +204,10 @@ function get_default_menu( $items = '' ) {
); );
} }
/* @codingStandardsIgnoreStart $items .= sprintf( /* @codingStandardsIgnoreStart $items .= sprintf(
'<li class="header__search js-search"><div class="header__search__form">%s</div></li>', * '<li class="header__search js-search"><div class="header__search__form">%s</div></li>',
get_search_form( false ) * get_search_form( false )
); @codingStandardsIgnoreEnd */ * ); @codingStandardsIgnoreEnd
*/
return $items; return $items;
} }
@ -162,13 +216,18 @@ function get_default_menu( $items = '' ) {
* Echo the default menu. * Echo the default menu.
* *
* @param string $items * @param string $items
* @return null
*/ */
function default_menu( $args = [], $items = '' ) { function default_menu( $args = [], $items = '' ) {
printf( printf(
"<{$args['container']} id='{$args['container_id']}' class='{$args['container_class']}'><ul id='{$args['menu_id']}' class='{$args['menu_class']}'>%s</ul></{$args['container']}>", "<{$args['container']} id='{$args['container_id']}' class='{$args['container_class']}'><ul id='{$args['menu_id']}' class='{$args['menu_class']}'>%s</ul></{$args['container']}>",
get_default_menu( $items ) get_default_menu( $items )
); );
if ( class_exists( '\PressbooksOAuth\OAuth' ) ) {
add_filter( 'pb_oauth_output_button', function( $bool ) {
return false;
} );
do_action( 'pressbooks_oauth_connect' );
}
} }
/** /**
@ -179,7 +238,7 @@ function default_menu( $args = [], $items = '' ) {
*/ */
function handle_contact_form_submission() { function handle_contact_form_submission() {
if ( ! isset( $_POST['pb_root_contact_form_nonce'] ) || ! wp_verify_nonce( $_POST['pb_root_contact_form_nonce'], 'pb_root_contact_form' ) ) { if ( ! isset( $_POST['pb_root_contact_form_nonce'] ) || ! wp_verify_nonce( $_POST['pb_root_contact_form_nonce'], 'pb_root_contact_form' ) ) {
return; // Security check failed. return false; // Security check failed.
} }
if ( isset( $_POST['submitted'] ) ) { if ( isset( $_POST['submitted'] ) ) {
$output = []; $output = [];
@ -243,12 +302,13 @@ function handle_contact_form_submission() {
* Does a page have page sections? * Does a page have page sections?
* *
* @param int $post_id The page. * @param int $post_id The page.
*
* @return bool * @return bool
*/ */
function has_sections( $post_id ) { function has_sections( $post_id ) {
$post_content = get_post_field( 'post_content', $post_id ); $post_content = get_post_field( 'post_content', $post_id );
if ( ! empty( $post_content ) ) { if ( ! empty( $post_content ) ) {
if ( strpos( $post_content, 'page-section' ) ) { if ( strpos( $post_content, 'page-section' ) || strpos( $post_content, 'aldine_page_section' ) ) {
return true; return true;
} else { } else {
return false; return false;

58
inc/shortcodes/namespace.php

@ -0,0 +1,58 @@
<?php
/**
* Aldine Shortcodes
*
* @package Aldine
*/
namespace Aldine\Shortcodes;
/**
* Shortcode for Page Section.
*
* @param array $atts
* @param string $content
*
* @return string
*/
function page_section( $atts, $content = null ) {
$atts = shortcode_atts(
[
'title' => 'Page Section',
'variant' => '',
],
$atts,
'aldine_page_section'
);
return sprintf(
'<div class="page-section%1$s"><h2>%2$s</h2>%3$s</div>',
( $atts['variant'] ) ? " page-section--{$atts['variant']}" : '',
$atts['title'],
$content
);
}
/**
* Shortcode for custom Call to Action.
*
* @param array $atts
*
* @return string
*/
function call_to_action( $atts ) {
$atts = shortcode_atts(
[
'link' => '#',
'text' => 'Call To Action',
],
$atts,
'aldine_call_to_action'
);
return sprintf(
'<a class="call-to-action" href="%1$s" title="%2$s">%2$s</a>',
$atts['link'],
$atts['text']
);
}

334
languages/pressbooks-aldine.pot

@ -1,4 +1,4 @@
# Copyright (C) 2017 pressbooks-aldine # Copyright (C) 2018 pressbooks-aldine
# This file is distributed under the same license as the pressbooks-aldine package. # This file is distributed under the same license as the pressbooks-aldine package.
msgid "" msgid ""
msgstr "" msgstr ""
@ -19,15 +19,7 @@ msgid "Oops! That page can&rsquo;t be found."
msgstr "" msgstr ""
#: ../404.php:21 #: ../404.php:21
msgid "It looks like nothing was found at this location. Maybe try one of the links below or a search?" msgid "It looks like nothing was found at this location."
msgstr ""
#: ../404.php:30
msgid "Most Used Categories"
msgstr ""
#: ../404.php:47
msgid "Try looking in the monthly archives. %1$s"
msgstr "" msgstr ""
#: ../comments.php:34 #: ../comments.php:34
@ -45,11 +37,11 @@ msgstr[1] ""
msgid "Comments are closed." msgid "Comments are closed."
msgstr "" msgstr ""
#: ../footer.php:36 #: ../footer.php:40, ../footer.php:44
msgid "%s on Facebook" msgid "%s on Facebook"
msgstr "" msgstr ""
#: ../footer.php:41 #: ../footer.php:48, ../footer.php:52
msgid "%s on Twitter" msgid "%s on Twitter"
msgstr "" msgstr ""
@ -61,231 +53,329 @@ msgstr ""
msgid "You must run <code>composer install</code> from the Aldine directory." msgid "You must run <code>composer install</code> from the Aldine directory."
msgstr "" msgstr ""
#: ../functions.php:81 #: ../header.php:44
msgid "Network Footer Menu" msgid "Skip to content"
msgstr ""
#: ../header.php:60
msgid "Logo for %s"
msgstr "" msgstr ""
#: ../functions.php:150 #: ../inc/intervention.php:12
msgid "Front Page Content" msgid "Hello,"
msgstr ""
#: ../inc/actions/namespace.php:48, ../inc/activation/namespace.php:114
msgid "Primary Menu"
msgstr "" msgstr ""
#: ../functions.php:162 #: ../inc/actions/namespace.php:49, ../inc/activation/namespace.php:135
msgid "Footer Menu"
msgstr ""
#: ../inc/actions/namespace.php:104
msgid "Network Footer Block 1" msgid "Network Footer Block 1"
msgstr "" msgstr ""
#: ../functions.php:172 #: ../inc/actions/namespace.php:114
msgid "Network Footer Block 2" msgid "Network Footer Block 2"
msgstr "" msgstr ""
#: ../header.php:25 #: ../inc/actions/namespace.php:139
msgid "Skip to content" msgid "Increase Font Size"
msgstr "" msgstr ""
#: ../header.php:29 #: ../inc/actions/namespace.php:140
msgid "Toggle menu" msgid "Decrease Font Size"
msgstr "" msgstr ""
#: ../header.php:39 #: ../inc/actions/namespace.php:223
msgid "Sign in" msgid "This page displays your network catalog, so there is no content to edit."
msgstr "" msgstr ""
#: ../header.php:41 #: ../inc/activation/namespace.php:25
msgid "Sign up" msgid "About Pressbooks"
msgstr "" msgstr ""
#: ../header.php:43 #: ../inc/activation/namespace.php:26
msgid "Admin" msgid "Pressbooks is easy-to-use book writing software that lets you create a book in all the formats you need to publish."
msgstr "" msgstr ""
#: ../header.php:45 #: ../inc/activation/namespace.php:27
msgid "Sign out" msgid "Learn More"
msgstr "" msgstr ""
#: ../inc/intervention.php:12 #: ../inc/activation/namespace.php:34, ../inc/activation/namespace.php:140, ../inc/activation/namespace.php:146
msgid "Hello," msgid "About"
msgstr "" msgstr ""
#: ../inc/activation/namespace.php:19 #: ../inc/activation/namespace.php:39
msgid "About" msgid "Pressbooks is simple book production software. You can use Pressbooks to publish textbooks, scholarly monographs, syllabi, fiction and non-fiction books, white papers, and more in multiple formats including:"
msgstr ""
#: ../inc/activation/namespace.php:40
msgid "MOBI (for Kindle ebooks)"
msgstr ""
#: ../inc/activation/namespace.php:41
msgid "EPUB (for all other ebookstores)"
msgstr ""
#: ../inc/activation/namespace.php:42
msgid "designed PDF (for print-on-demand and digital distribution)"
msgstr "" msgstr ""
#: ../inc/activation/namespace.php:23 #: ../inc/activation/namespace.php:45
msgid "For more information about Pressbooks, %s."
msgstr ""
#: ../inc/activation/namespace.php:46
msgid "see here"
msgstr ""
#: ../inc/activation/namespace.php:52, ../inc/activation/namespace.php:170, ../inc/activation/namespace.php:176
msgid "Help" msgid "Help"
msgstr "" msgstr ""
#: ../inc/activation/namespace.php:27, ../page-catalog.php:4 #: ../inc/activation/namespace.php:58
msgid "The easiest way to get started with Pressbooks is to follow our %1$s. Or, you can review our %2$s."
msgstr ""
#: ../inc/activation/namespace.php:59
msgid "4 Step Guide to Making a Book on Pressbooks"
msgstr ""
#: ../inc/activation/namespace.php:60
msgid "Guide to Using Pressbooks"
msgstr ""
#: ../inc/activation/namespace.php:62
msgid "If you require further assistance, please contact your network manager."
msgstr ""
#: ../inc/activation/namespace.php:67, ../inc/activation/namespace.php:119, ../inc/activation/namespace.php:125, ../inc/activation/namespace.php:155, ../inc/activation/namespace.php:161, ../page-catalog.php:4
msgid "Catalog" msgid "Catalog"
msgstr "" msgstr ""
#: ../inc/activation/namespace.php:31 #: ../inc/activation/namespace.php:71, ../inc/helpers/namespace.php:162
msgid "Home" msgid "Home"
msgstr "" msgstr ""
#: ../inc/customizer/namespace.php:37 #: ../inc/admin/namespace.php:30
msgid "Catalog updated."
msgstr ""
#: ../inc/admin/namespace.php:31
msgid "Sorry, but your catalog was not updated. Please try again."
msgstr ""
#: ../inc/admin/namespace.php:32
msgid "Dismiss this notice."
msgstr ""
#: ../inc/admin/namespace.php:61
msgid "In Catalog"
msgstr ""
#: ../inc/admin/namespace.php:72
msgctxt "pressbooks-aldine"
msgid "Show in Catalog"
msgstr ""
#: ../inc/admin/namespace.php:73
msgctxt "pressbooks-aldine"
msgid "This book is private, so you can&rsquo;t display it in your catalog."
msgstr ""
#: ../inc/customizer/namespace.php:45
msgid "Primary Color" msgid "Primary Color"
msgstr "" msgstr ""
#: ../inc/customizer/namespace.php:38 #: ../inc/customizer/namespace.php:46
msgid "Primary color, used for links and other primary elements." msgid "Primary color, used for links and other primary elements."
msgstr "" msgstr ""
#: ../inc/customizer/namespace.php:43 #: ../inc/customizer/namespace.php:51
msgid "Accent Color" msgid "Accent Color"
msgstr "" msgstr ""
#: ../inc/customizer/namespace.php:44 #: ../inc/customizer/namespace.php:52
msgid "Accent color, used for flourishes and secondary elements." msgid "Accent color, used for flourishes and secondary elements."
msgstr "" msgstr ""
#: ../inc/customizer/namespace.php:49 #: ../inc/customizer/namespace.php:57
msgid "Primary Foreground Color" msgid "Primary Foreground Color"
msgstr "" msgstr ""
#: ../inc/customizer/namespace.php:50 #: ../inc/customizer/namespace.php:58
msgid "Used for text on a primary background." msgid "Used for text on a primary background."
msgstr "" msgstr ""
#: ../inc/customizer/namespace.php:55 #: ../inc/customizer/namespace.php:63
msgid "Accent Foreground Color" msgid "Accent Foreground Color"
msgstr "" msgstr ""
#: ../inc/customizer/namespace.php:56 #: ../inc/customizer/namespace.php:64
msgid "Used for text on an accent color background." msgid "Used for text on an accent color background."
msgstr "" msgstr ""
#: ../inc/customizer/namespace.php:75 #: ../inc/customizer/namespace.php:83
msgid "Social Media" msgid "Social Media"
msgstr "" msgstr ""
#: ../inc/customizer/namespace.php:83 #: ../inc/customizer/namespace.php:91
msgid "Facebook" msgid "Facebook"
msgstr "" msgstr ""
#: ../inc/customizer/namespace.php:92 #: ../inc/customizer/namespace.php:100
msgid "Twitter" msgid "Twitter"
msgstr "" msgstr ""
#: ../inc/customizer/namespace.php:99 #: ../inc/customizer/namespace.php:107
msgid "Front Page Catalog" msgid "Front Page Catalog"
msgstr "" msgstr ""
#: ../inc/customizer/namespace.php:106 #: ../inc/customizer/namespace.php:114
msgid "Show Front Page Catalog" msgid "Show Front Page Catalog"
msgstr "" msgstr ""
#: ../inc/customizer/namespace.php:116 #: ../inc/customizer/namespace.php:124
msgid "Front Page Catalog Title" msgid "Front Page Catalog Title"
msgstr "" msgstr ""
#: ../inc/customizer/namespace.php:123 #: ../inc/customizer/namespace.php:131
msgid "Contact Form" msgid "Contact Form"
msgstr "" msgstr ""
#: ../inc/customizer/namespace.php:130 #: ../inc/customizer/namespace.php:138
msgid "Show Contact Form" msgid "Show Contact Form"
msgstr "" msgstr ""
#: ../inc/customizer/namespace.php:140 #: ../inc/customizer/namespace.php:148
msgid "Contact Form Title" msgid "Contact Form Title"
msgstr "" msgstr ""
#: ../inc/filters/namespace.php:38 #: ../inc/filters/namespace.php:60
msgid "Continued" msgid "Continued"
msgstr "" msgstr ""
#: ../inc/helpers/namespace.php:103 #: ../inc/filters/namespace.php:84
msgid "Page Section"
msgstr ""
#: ../inc/filters/namespace.php:90
msgid "Page Section (Accent)"
msgstr ""
#: ../inc/filters/namespace.php:96
msgid "Page Section (Bordered)"
msgstr ""
#: ../inc/filters/namespace.php:102
msgid "Page Section (Borderless)"
msgstr ""
#: ../inc/filters/namespace.php:108
msgid "Call to Action"
msgstr ""
#: ../inc/helpers/namespace.php:168
msgid "Contact"
msgstr ""
#: ../inc/helpers/namespace.php:175
msgid "Sign In"
msgstr ""
#: ../inc/helpers/namespace.php:181
msgid "Sign Up"
msgstr ""
#: ../inc/helpers/namespace.php:189
msgid "Admin"
msgstr ""
#: ../inc/helpers/namespace.php:197
msgid "My Books"
msgstr ""
#: ../inc/helpers/namespace.php:203
msgid "Sign Out"
msgstr ""
#: ../inc/helpers/namespace.php:256
msgid "Name is required." msgid "Name is required."
msgstr "" msgstr ""
#: ../inc/helpers/namespace.php:107 #: ../inc/helpers/namespace.php:260
msgid "Email is required." msgid "Email is required."
msgstr "" msgstr ""
#: ../inc/helpers/namespace.php:111 #: ../inc/helpers/namespace.php:264
msgid "Email is invalid." msgid "Email is invalid."
msgstr "" msgstr ""
#: ../inc/helpers/namespace.php:115 #: ../inc/helpers/namespace.php:268
msgid "Institution is required." msgid "Institution is required."
msgstr "" msgstr ""
#: ../inc/helpers/namespace.php:119 #: ../inc/helpers/namespace.php:272
msgid "Message is required." msgid "Message is required."
msgstr "" msgstr ""
#: ../inc/helpers/namespace.php:125 #: ../inc/helpers/namespace.php:278
msgid "Contact Form Submission from %s" msgid "Contact Form Submission from %s"
msgstr "" msgstr ""
#: ../inc/helpers/namespace.php:136 #: ../inc/helpers/namespace.php:289
msgid "Your message was sent!" msgid "Your message was sent!"
msgstr "" msgstr ""
#: ../inc/helpers/namespace.php:139 #: ../inc/helpers/namespace.php:292
msgid "Your message could not be sent." msgid "Your message could not be sent."
msgstr "" msgstr ""
#: ../partials/book.php:19 #: ../page-catalog.php:55
msgid "About this book &rarr;" msgid "No Books Found"
msgstr "" msgstr ""
#: ../partials/contact-form.php:11 #: ../page-catalog.php:58
msgid "Contact Us" msgid "No books have been added to the catalog."
msgstr "" msgstr ""
#: ../partials/contact-form.php:25 #: ../partials/book.php:27
msgid "Your name (required)" msgid "About this book"
msgstr "" msgstr ""
#: ../partials/contact-form.php:25 #: ../partials/contact-form.php:11
msgid "Your name*" msgid "Contact Us"
msgstr "" msgstr ""
#: ../partials/contact-form.php:29 #: ../partials/contact-form.php:29
msgid "Your email address (required)" msgid "Your name (required)"
msgstr "" msgstr ""
#: ../partials/contact-form.php:29 #: ../partials/contact-form.php:37
msgid "Your email*" msgid "Your email address (required)"
msgstr "" msgstr ""
#: ../partials/contact-form.php:33 #: ../partials/contact-form.php:45
msgid "Your institution (required)" msgid "Your institution (required)"
msgstr "" msgstr ""
#: ../partials/contact-form.php:33 #: ../partials/contact-form.php:53
msgid "Your institution*"
msgstr ""
#: ../partials/contact-form.php:37
msgid "Your message (required)" msgid "Your message (required)"
msgstr "" msgstr ""
#: ../partials/contact-form.php:37 #: ../partials/contact-form.php:57
msgid "Your message here*"
msgstr ""
#: ../partials/contact-form.php:40
msgid "Send" msgid "Send"
msgstr "" msgstr ""
#: ../partials/content-front-page.php:19 #: ../partials/content-front-page.php:17
msgid "Our Latest Titles" msgid "Our Latest Titles"
msgstr "" msgstr ""
#: ../partials/content-front-page.php:33 #: ../partials/content-front-page.php:52
msgid "About Pressbooks"
msgstr ""
#: ../partials/content-front-page.php:34
msgid "Pressbooks is easy-to-use book writing software that lets you create a book in all the formats you need to publish."
msgstr ""
#: ../partials/content-front-page.php:35
msgid "Learn More"
msgstr ""
#: ../partials/content-front-page.php:56
msgid "View Complete Catalog" msgid "View Complete Catalog"
msgstr "" msgstr ""
@ -305,40 +395,44 @@ msgstr ""
msgid "It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching can help." msgid "It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching can help."
msgstr "" msgstr ""
#: ../partials/content-page-catalog.php:33 #: ../partials/content-page-catalog.php:17
msgid "Search by titles or keyword" msgid "Filter by Subject"
msgstr ""
#: ../partials/content-page-catalog.php:19
msgid "All Subjects"
msgstr "" msgstr ""
#: ../partials/content-page-catalog.php:36 #: ../partials/content-page-catalog.php:35
msgid "Filter by" msgid "Filter by License"
msgstr "" msgstr ""
#: ../partials/content-page-catalog.php:52 #: ../partials/content-page-catalog.php:37
msgid "Licenses" msgid "All Licenses"
msgstr "" msgstr ""
#: ../partials/content-page-catalog.php:61 #: ../partials/content-page-catalog.php:46
msgid "Sort by" msgid "Sort by"
msgstr "" msgstr ""
#: ../partials/content-page-catalog.php:63 #: ../partials/content-page-catalog.php:49
msgid "Title" msgid "Title"
msgstr "" msgstr ""
#: ../partials/content-page-catalog.php:64 #: ../partials/content-page-catalog.php:50
msgid "Subject" msgid "Subject"
msgstr "" msgstr ""
#: ../partials/content-page-catalog.php:65 #: ../partials/content-page-catalog.php:51
msgid "Latest" msgid "Latest"
msgstr "" msgstr ""
#: ../partials/content-page-catalog.php:76 #: ../partials/content-page-catalog.php:58
msgid "Previous" msgid "Clear Filters"
msgstr "" msgstr ""
#: ../partials/content-page-catalog.php:86 #: ../partials/content-page-catalog.php:59
msgid "Next" msgid "Submit"
msgstr "" msgstr ""
#: ../partials/content-page.php:22, ../partials/content.php:45 #: ../partials/content-page.php:22, ../partials/content.php:45
@ -353,6 +447,20 @@ msgstr ""
msgid "Continue reading<span class=\"screen-reader-text\"> \"%s\"</span>" msgid "Continue reading<span class=\"screen-reader-text\"> \"%s\"</span>"
msgstr "" msgstr ""
#: ../partials/paged-navigation.php:2
msgid "Navigation"
msgstr ""
#: ../search.php:21 #: ../search.php:21
msgid "Search Results for: %s" msgid "Search Results for: %s"
msgstr "" msgstr ""
#: ../searchform.php:3
msgctxt "label"
msgid "Search Catalog"
msgstr ""
#: ../searchform.php:6
msgctxt "submit button"
msgid "Search"
msgstr ""

1642
package-lock.json generated

File diff suppressed because it is too large Load Diff

12
package.json

@ -1,9 +1,9 @@
{ {
"name": "@pressbooks/pressbooks-aldine", "name": "@pressbooks/pressbooks-aldine",
"version": "1.0.0-beta.1", "version": "1.0.0",
"author": "Pressbooks (Book Oven Inc.) <code@pressbooks.com>", "author": "Pressbooks (Book Oven Inc.) <code@pressbooks.com>",
"homepage": "https://github.com/pressbooks/pressbooks-aldine/", "homepage": "https://github.com/pressbooks/pressbooks-aldine/",
"description": "Aldine is the root theme for Pressbooks.", "description": "Aldine is the default theme for the home page of Pressbooks networks. It is named for the Aldine Press, founded by Aldus Manutius in 1494, who is regarded by many as the world’s first publisher.",
"keywords": [ "keywords": [
"publishing", "publishing",
"catalog", "catalog",
@ -46,18 +46,18 @@
"start": "cross-env NODE_ENV=development webpack --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", "start": "cross-env NODE_ENV=development webpack --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
"rmdist": "rimraf dist", "rmdist": "rimraf dist",
"lint": "npm run -s lint:scripts && npm run -s lint:styles", "lint": "npm run -s lint:scripts && npm run -s lint:styles",
"lint:scripts": "node_modules/eslint/bin/eslint.js \"assets/scripts/*.js\"", "lint:scripts": "cross-env NODE_ENV=development node_modules/eslint/bin/eslint.js \"assets/scripts/*.js\"",
"lint:styles": "node_modules/stylelint/bin/stylelint.js \"assets/styles/**/*.scss\" --syntax scss", "lint:styles": "cross-env NODE_ENV=development node_modules/stylelint/bin/stylelint.js \"assets/styles/**/*.scss\" --syntax scss",
"test": "npm run -s lint" "test": "npm run -s lint"
}, },
"engines": { "engines": {
"node": ">= 6.9.4" "node": ">= 6.9.4"
}, },
"devDependencies": { "devDependencies": {
"pressbooks-build-tools": "^0.9.0" "pressbooks-build-tools": "^0.11.0"
}, },
"dependencies": { "dependencies": {
"aetna": "^1.0.0-alpha", "aetna": "^1.0.0-alpha.17",
"isotope-layout": "^3.0.5", "isotope-layout": "^3.0.5",
"jquery-bridget": "^2.0.1", "jquery-bridget": "^2.0.1",
"js-cookie": "^2.2.0", "js-cookie": "^2.2.0",

46
page-catalog.php

@ -9,12 +9,31 @@
* @package Aldine * @package Aldine
*/ */
get_header(); ?> use function Aldine\Helpers\get_catalog_data;
use function Aldine\Helpers\get_catalog_licenses;
use function Aldine\Helpers\get_available_subjects;
use function Aldine\Helpers\get_available_licenses;
$current_page = ( get_query_var( 'paged' ) ) ? get_query_var( 'paged' ) : 1;
$orderby = ( get_query_var( 'orderby' ) ) ? get_query_var( 'orderby' ) : 'title';
$subject = ( get_query_var( 'subject' ) ) ? get_query_var( 'subject' ) : '';
$license = ( get_query_var( 'license' ) ) ? get_query_var( 'license' ) : '';
$catalog_data = get_catalog_data( $current_page, 9, $orderby, $license, $subject );
$previous_page = ( $current_page > 1 ) ? $current_page - 1 : 0;
$next_page = $current_page + 1;
$licenses = get_catalog_licenses();
$available_licenses = get_available_licenses( $catalog_data );
$subjects = ( defined( 'PB_PLUGIN_VERSION' ) ) ? \Pressbooks\Metadata\get_thema_subjects() : [];
$available_subjects = get_available_subjects( $catalog_data );
if ( ! empty( $catalog_data['books'] ) ) :
get_header(); ?>
<div id="primary" class="content-area"> <div id="primary" class="content-area">
<main id="main" class="site-main"> <main id="main" class="site-main">
<?php get_template_part( 'partials/content', 'page-catalog' ); ?> <?php include( locate_template( 'partials/content-page-catalog.php' ) ); ?>
</main><!-- #main --> </main><!-- #main -->
</div><!-- #primary --> </div><!-- #primary -->
@ -22,3 +41,26 @@ get_header(); ?>
<?php <?php
get_sidebar(); get_sidebar();
get_footer(); get_footer();
else :
global $wp_query;
$wp_query->set_404();
status_header( 404 );
get_header();
?>
<div id="primary" class="content-area">
<main id="main" class="site-main">
<article class="page">
<header class="entry-header">
<h1 class="entry-title"><?php _e( 'No Books Found', 'pressbooks-aldine' ); ?></h1>
</header>
<div class="entry-content" style="text-align:center;">
<p><?php _e( 'No books have been added to the catalog.', 'pressbooks-aldine' ); ?></p>
</div>
</article>
</main>
</div>
<?php
get_footer();
exit();
endif;

12
partials/content-front-page.php

@ -15,10 +15,12 @@ use function Aldine\Helpers\get_catalog_data;
$front_page_catalog = get_option( 'pb_front_page_catalog' ); $front_page_catalog = get_option( 'pb_front_page_catalog' );
$latest_books_title = get_option( 'pb_front_page_catalog_title', __( 'Our Latest Titles', 'pressbooks-aldine' ) ); $latest_books_title = get_option( 'pb_front_page_catalog_title', __( 'Our Latest Titles', 'pressbooks-aldine' ) );
$page = ( get_query_var( 'page' ) ) ? get_query_var( 'page' ) : 1; if ( get_option( 'pb_front_page_catalog' ) ) {
$catalog_data = get_catalog_data( $page, 3 ); $page = ( get_query_var( 'page' ) ) ? get_query_var( 'page' ) : 1;
$previous_page = ( $page > 1 ) ? $page - 1 : 0; $catalog_data = get_catalog_data( $page, 3, 'latest' );
$next_page = $page + 1; $previous_page = ( $page > 1 ) ? $page - 1 : 0;
$next_page = $page + 1;
}
?> ?>
@ -35,7 +37,7 @@ $next_page = $page + 1;
</div><!-- .entry-content --> </div><!-- .entry-content -->
</article><!-- #post-<?php the_ID(); ?> --> </article><!-- #post-<?php the_ID(); ?> -->
<?php if ( get_option( 'pb_front_page_catalog' ) ) : ?> <?php if ( get_option( 'pb_front_page_catalog' ) && ! empty( $catalog_data['books'] ) ) : ?>
<div id="latest-books" class="latest-books"> <div id="latest-books" class="latest-books">
<h2 id="latest-books-title"><?php echo $latest_books_title; ?></h2> <h2 id="latest-books-title"><?php echo $latest_books_title; ?></h2>
<div class="slider" role="region" aria-labelledby="latest-books-title" data-total-pages="<?php echo $catalog_data['pages']; ?>" <?php if ( $next_page <= $catalog_data['pages'] ) : ?>data-next-page="<?php echo $next_page; ?>"<?php endif; ?>> <div class="slider" role="region" aria-labelledby="latest-books-title" data-total-pages="<?php echo $catalog_data['pages']; ?>" <?php if ( $next_page <= $catalog_data['pages'] ) : ?>data-next-page="<?php echo $next_page; ?>"<?php endif; ?>>

20
partials/content-page-catalog.php

@ -9,26 +9,6 @@
?> ?>
<?php
use function Aldine\Helpers\get_catalog_data;
use function Aldine\Helpers\get_catalog_licenses;
use function Aldine\Helpers\get_available_subjects;
use function Aldine\Helpers\get_available_licenses;
$current_page = ( get_query_var( 'paged' ) ) ? get_query_var( 'paged' ) : 1;
$orderby = ( get_query_var( 'orderby' ) ) ? get_query_var( 'orderby' ) : 'title';
$subject = ( get_query_var( 'subject' ) ) ? get_query_var( 'subject' ) : '';
$license = ( get_query_var( 'license' ) ) ? get_query_var( 'license' ) : '';
$catalog_data = get_catalog_data( $current_page, 9, $orderby, $license, $subject );
$previous_page = ( $current_page > 1 ) ? $current_page - 1 : 0;
$next_page = $current_page + 1;
$licenses = get_catalog_licenses();
$available_licenses = get_available_licenses( $catalog_data );
$subjects = ( defined( 'PB_PLUGIN_VERSION' ) ) ? \Pressbooks\Metadata\get_thema_subjects() : [];
$available_subjects = get_available_subjects( $catalog_data );
?>
<?php get_template_part( 'partials/page', 'header' ); ?> <?php get_template_part( 'partials/page', 'header' ); ?>
<section class="network-catalog"> <section class="network-catalog">
<form role="form" class="filter-sort" method="get"> <form role="form" class="filter-sort" method="get">

38
readme.txt

@ -4,17 +4,17 @@
Tags: publishing, catalog, pressbooks, default-theme Tags: publishing, catalog, pressbooks, default-theme
Requires at least: 4.9.1 Requires at least: 4.9.4
Tested up to: 4.9.1 Tested up to: 4.9.4
Stable tag: 1.0.0-alpha6 Stable tag: 1.0.0
License: GNU General Public License v2 or later License: GNU General Public License v3
License URI: LICENSE License URI: LICENSE
Aldine is the root theme for Pressbooks. Aldine is the default theme for the home page of Pressbooks networks. It is named for the Aldine Press, founded by Aldus Manutius in 1494, who is regarded by many as the world’s first publisher.
== Description == == Description ==
Aldine is the root theme for [Pressbooks](https://pressbooks.org), based on [Underscores](https://underscores.me/). Aldine is the default theme for the home page of [Pressbooks](https://pressbooks.org) networks. It is named for the Aldine Press, founded by Aldus Manutius in 1494, who is regarded by many as the world’s first publisher. Aldine is based on [Underscores](https://underscores.me/).
== Installation == == Installation ==
@ -28,29 +28,19 @@ TK.
== Changelog == == Changelog ==
= 1.0.0-alpha6 = === Aldine 1.0.0 ===
* **[FEATURE]** Add Per Soderlind's WCAG validator to customizer.
* **[FEATURE]** Add Thema subject support.
= 1.0.0-alpha5 = #### Customisation & Branding
* **[CORE ENHANCEMENT]** Configure for use without Pressbooks (see #26).
= 1.0.0-alpha4 = Aldine is the new default network theme for Pressbooks installations. Its creation was supported by [Ryerson University](https://ryerson.ca). Designed with customization in mind, it allows network managers to add institutional branding in the form of colours, logos and contact information, as well as custom content in blocks on the front page.
* **[CORE ENHANCEMENT]** Save `/dist` folder.
* **[FIX]** Add temporary fix for roots/sage-lib#2.
= 1.0.0-alpha3 = #### Standalone Catalog
* **[CORE ENHANCEMENT]** Move required theme files to root (see #24 and #25).
= 1.0.0-alpha2 = In addition, Aldine introduces a standalone catalog page that is sortable and filterable by subject or license. Adding books to the catalog is controlled in the [same way as before](https://eduguide.pressbooks.com/chapter/catalogs/).
* **[CORE ENHANCEMENT]** Optimize activation routine.
* **[FIX]** Remove extra wrapper on catalog and landing pages.
* **[FIX]** Resolve error when activating without active widgets.
= 1.0.0-alpha1 = #### Additional Pages
* Basic landing page implementation
* Basic catalog page implementation You can now more easily add additional pages to the network root, such as an “About Us” or “Help” page.
* Basic customizer capabilities
== Credits == == Credits ==

BIN
screenshot.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 MiB

After

Width:  |  Height:  |  Size: 401 KiB

10
style.css

@ -1,15 +1,15 @@
/* /*
Theme Name: Aldine Theme Name: Aldine
Theme URI: https://pressbooks.org/themes/aldine Theme URI: https://github.com/pressbooks/pressbooks-aldine/
Description: Aldine is the root theme for Pressbooks. Description: Aldine is the default theme for the home page of Pressbooks networks. It is named for the Aldine Press, founded by Aldus Manutius in 1494, who is regarded by many as the worlds first publisher.
Version: 1.0.0-alpha.6 Version: 1.0.0
Author: Pressbooks (Book Oven Inc.) Author: Pressbooks (Book Oven Inc.)
Author URI: https://pressbooks.org Author URI: https://pressbooks.org
Text Domain: pressbooks-aldine Text Domain: pressbooks-aldine
GitHub Theme URI: pressbooks/pressbooks-aldine GitHub Theme URI: pressbooks/pressbooks-aldine
Release Asset: true Release Asset: true
License: GNU General Public License v2 or later License: GNU General Public License v3
License URI: http://opensource.org/licenses/GPL-2.0 License URI: http://opensource.org/licenses/GPL-3.0
Aldine is based on Underscores https://underscores.me/, (C) 2012-2017 Automattic, Inc. Aldine is based on Underscores https://underscores.me/, (C) 2012-2017 Automattic, Inc.
Underscores is distributed under the terms of the GNU GPL v2 or later. Underscores is distributed under the terms of the GNU GPL v2 or later.

1
webpack.mix.js

@ -42,6 +42,7 @@ mix.autoload({ jquery: ['$', 'window.jQuery', 'jQuery'] });
mix mix
.js(`${assets}/scripts/aldine.js`, `${dist}/scripts`) .js(`${assets}/scripts/aldine.js`, `${dist}/scripts`)
.js(`${assets}/scripts/catalog-admin.js`, `${dist}/scripts`)
.js(`${assets}/scripts/customizer.js`, `${dist}/scripts`); .js(`${assets}/scripts/customizer.js`, `${dist}/scripts`);
// Assets // Assets

1765
yarn.lock

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save