Commit: 0a38599a5d11dea22c80f804b3d7e49365a8929a
Author: Levi Morrison <[email protected]> Wed, 7 May 2014 20:57:42 -0600
Parents: a498ad37289def435cc8148ae2fde8daf75ed907
Branches: master
Link:
http://git.php.net/?p=web/php.git;a=commitdiff;h=0a38599a5d11dea22c80f804b3d7e49365a8929a
Log:
'add a note' now shows up (was accidentally hidden); also fixed add-note.php
layout
Changed paths:
M manual/add-note.php
A styles/add-note.css
M styles/theme-base.css
diff --git a/manual/add-note.php b/manual/add-note.php
index f58843c..e9d69bf 100644
--- a/manual/add-note.php
+++ b/manual/add-note.php
@@ -9,7 +9,7 @@ include_once $_SERVER['DOCUMENT_ROOT'] .
'/include/posttohost.inc';
include_once $_SERVER['DOCUMENT_ROOT'] . '/include/shared-manual.inc';
include $_SERVER['DOCUMENT_ROOT'] . '/manual/spam_challenge.php';
-site_header("Add Manual Note");
+site_header("Add Manual Note", array( 'css' => 'add-note.css'));
// Copy over "sect" and "redirect" from GET to POST
if (empty($_POST['sect']) && isset($_GET['sect'])) {
@@ -156,66 +156,55 @@ if ($process) {
else {
?>
-<div id="add-note-usernotes" class="row-fluid">
-<div class="span4">
-
+<section id="add-note-usernotes" class="clearfix">
<h1>Adding a note to the manual</h1>
-
- <ul>
- <li>
- Please read <a href="#whatnottoenter">What not to enter</a>
- we have many comments to moderate and there is an overwhelming number of
- users ignoring this important section.
- </li>
- <li>
- Good notes (high score) are voted up and <strong>rise to top</strong>
- so they are easy to find.
- </li>
- <li>
- Low score (negative) notes are faded out to discourage usage and
- after certain threshold are removed.
- </li>
- <li>
- Any form of spam is removed immediately. Some folks still don't get it.
- </li>
- </ul>
-
-</div>
-<div class="span8">
-<div class="shadow"></div>
-<div id="usernotes">
-
-<h3 class="title">User Contributed Notes <span class="count">3
notes</span></h3>
-
-<div class="note bad">
- <div class="votes">
- <div>
- <a class="usernotes-voteu" title="Vote up!">up</a>
- </div>
- <div>
- <a class="usernotes-voted" title="Vote down!">down</a>
- </div>
- <div title="" class="tally">
- 3
- </div>
- </div>
- <a class="name"><strong class="user"><em>Anonymous</em></strong></a>
- <a class="genanchor" href="#"> ¶</a>
- <div class="date">
- <strong>
- 1 year ago
- </strong>
+ <div class="note_description">
+ <ul>
+ <li>
+ Please read <a href="#whatnottoenter">What not to enter</a>
+ we have many comments to moderate and there is an overwhelming number
of
+ users ignoring this important section.
+ </li>
+ <li>
+ <em>Good notes rise to the top</em> as they are voted up; this makes
+ them easier to find.
+ </li>
+ <li>
+ <em>Poor notes fall to the bottom and are faded out</em> to discourage
+ their use; after certain threshold they are removed.
+ </li>
+ <li>Any form of spam is removed immediately.</li>
+ </ul>
</div>
- <div class="text">
- <div class="phpcode">
- <code>
- <span class="html">
- <p>eval() is the best for all sorts of things</p>
- </span>
- </code>
+ <div class="note_example">
+ <div class="shadow"></div>
+ <div id="usernotes">
+ <h3 class="title">User Contributed Notes <span class="count">3
notes</span></h3>
+ <div class="note bad">
+ <div class="votes">
+ <div>
+ <a class="usernotes-voteu" title="Vote up!">up</a>
+ </div>
+ <div>
+ <a class="usernotes-voted" title="Vote down!">down</a>
+ </div>
+ <div class="tally">3</div>
+ </div>
+ <a class="name"><strong class="user"><em>Anonymous</em></strong></a>
+ <a class="genanchor" href="#"> ¶</a>
+ <div class="date">
+ <strong>1 year ago</strong>
+ </div>
+ <div class="text">
+ <div class="phpcode">
+ <code>
+ <span class="html">
+ <p>eval() is the best for all sorts of things</p>
+ </span>
+ </code>
+ </div>
+ </div>
</div>
- </div>
-</div>
<div class="note good">
<div class="votes">
@@ -280,85 +269,58 @@ else {
</div>
</div>
-</div>
+</section>
-<div id="whatnottoenter">
+<section id="whatnottoenter" class='clearfix'>
<h3>Thou shall not enter! <small>(No, really, don't)</small></h3>
-
-<div class="row-fluid">
- <div class="span3">
- <strong>Bug reports & Missing documentation</strong> Instead
- <a href="http://bugs.php.net/report.php?bug_type=Documentation+problem<?php
echo isset($_POST['sect']) ? '&manpage=' . clean($_POST['sect']) : '';
?>">report a bug</a>
+<div class='columns'>
+<ul>
+ <li><strong>Bug reports & Missing documentation</strong>
+ Instead <a
href="http://bugs.php.net/report.php?bug_type=Documentation+problem<?php echo
isset($_POST['sect']) ? '&manpage=' . clean($_POST['sect']) : '';
?>">report a bug</a>
for this manual page to the bug database.
- </div>
- <div class="span3">
- <strong>Support questions or request for help</strong> See the <a
href="/support.php">support page</a>
- for available options. In other words, do not ask questions within the
user notes.
- </div>
- <div class="span3">
- <strong>References to other notes or authors</strong> This is not a forum;
- we do not encourage nor permit discussions here. Further, if a note is
- referenced directly and is later removed or modified it causes confusion.
- </div>
- <div class="span3">
- <strong>Code collaboration or improvements</strong> This is not to suggest
that
- your code snippet is bad; this is simply not the place to show it off. You
- should publish elsewhere (perhaps on your blog).
- </div>
-</div>
-<div class="row-fluid">
- <div class="span3">
- <strong>Links to your website, blog, code, or a third-party
website</strong>
- On occasion we permit the posting of websites such as faqs.org or the MySQL
- manual, but links to other sites will be removed, no matter how
well-intended.
- </div>
- <div class="span3">
- <strong>Complaints that your notes keep getting deleted</strong> Most
likely
- you didn't bother to read this page and you violated one of these rules.
- </div>
- <div class="span3">
- <strong>Notes in languages other than English</strong> 不 gach duine
понимает
- el lenguaje जिसमें Sie sprechen.
- </div>
- <div class="span3">
- <strong>Your disdain for PHP and/or its maintainers</strong> Go learn
FORTRAN instead.
- </div>
+ </li>
+ <li><strong>Support questions or request for help</strong> See the <a
href="/support.php">support page</a> for available options. In other words, do
not ask questions within the user notes.</li>
+ <li><strong>References to other notes or authors</strong> This is not a
forum; we do not encourage nor permit discussions here. Further, if a note is
referenced directly and is later removed or modified it causes confusion.
+ </li>
+ <li><strong>Code collaboration or improvements</strong> This is not to
suggest that your code snippet is bad; this is simply not the place to show it
off. You should publish elsewhere (perhaps on your blog).</li>
+ <li><strong>Links to your website, blog, code, or a third-party
website</strong> On occasion we permit the posting of websites such as faqs.org
or the MySQL manual, but links to other sites will be removed, no matter how
well-intended.</li>
+ <li><strong>Complaints that your notes keep getting deleted</strong> Most
likely you didn't bother to read this page and you violated one of these
rules.</li>
+ <li><strong>Notes in languages other than English</strong> 不 gach duine
понимает el lenguaje जिसमें Sie sprechen.</li>
+ <li><strong>Your disdain for PHP and/or its maintainers</strong> Go learn
FORTRAN instead.</li>
+</ul>
</div>
<p>User notes may be edited or deleted for any reason, whether in the list
above or not!</p>
+</section>
+
+
+<div id="email_and_formatting" class="clearfix">
+ <section>
+ <h3>Email address conversion</h3>
+ <p>
+ We have a simple conversion in place to convert the @ signs and dots in
your
+ address. You may still want to include a part in the email address
+ that is understandable only by humans as our conversion can be performed
in
+ the opposite direction. You may submit your email address as
+ <tt>[email protected]</tt> for example (which will be displayed
+ as <tt>user at NOSPAM dot example dot com</tt>. If we remove your note
we can
+ only send an email if you use your real email address.
+ </p>
+ </section>
+ <section>
+ <h3>Formatting</h3>
+ <p>
+ Note that HTML tags are not allowed in the posts, but the note formatting
+ is preserved. URLs will be turned into clickable links, PHP code blocks
+ enclosed in the PHP tags <?php and ?> will
+ be source highlighted automatically. So always enclose PHP snippets in
+ these tags. <em>Double-check that your note appears
+ as you want during the preview; that's why it is there!</em>
+ </p>
+ </section>
</div>
-
-<div class="row-fluid">
-
-<div class="span6">
-<h3>Email address conversion</h3>
-<p>
- We have a simple conversion in place to convert the @ signs and dots in your
- address. You may still want to include a part in the email address
- that is understandable only by humans as our conversion can be performed in
- the opposite direction. You may submit your email address as
- <tt>[email protected]</tt> for example (which will be displayed
- as <tt>user at NOSPAM dot example dot com</tt>. If we remove your note we can
- only send an email if you use your real email address.
-</p>
-</div>
-
-<div class="span6">
-<h3>Formatting</h3>
-<p>
- Note that HTML tags are not allowed in the posts, but the note formatting
- is preserved. URLs will be turned into clickable links, PHP code blocks
- enclosed in the PHP tags <?php and ?> will
- be source highlighted automatically. So always enclose PHP snippets in
- these tags. <em>(Double-check that your note appears
- as you want during the preview. That's why it is there!)</em>
-</p>
-</div>
-
-</div>
-
-<div class="row-fluid">
+<div class="row-fluid clearfix">
<div class="span12">
<h3>Additional information</h3>
<p>
diff --git a/styles/add-note.css b/styles/add-note.css
new file mode 100644
index 0000000..92af686
--- /dev/null
+++ b/styles/add-note.css
@@ -0,0 +1,54 @@
+#add-note-usernotes {
+ overflow: hidden;
+ position: relative;
+}
+
+#add-note-usernotes .shadow {
+ box-shadow: inset -10px 0 5px -5px rgba(0, 0, 0, 0.1);
+ width:3%;
+ height: 100%;
+ position:absolute;
+ float:right;
+ z-index:1;
+ left: 97%;
+}
+#layout-content li {
+ margin-bottom:1.5rem;
+}
+
+@media (min-width:768px) {
+ #email_and_formatting > section,
+ #add-note-usernotes .note_description,
+ #add-note-usernotes .note_example {
+ -moz-box-sizing:border-box;
+ box-sizing:border-box;
+ float:left;
+ }
+ #add-note-usernotes .note_description {
+ width:33.333333%;
+ }
+ #add-note-usernotes .note_example {
+ padding-left: 1.5rem;
+ width:66.666666%;
+ }
+ #email_and_formatting > section {
+ width:50%;
+ }
+ #email_and_formatting > section:first-child {
+ padding-right:1.5rem;
+ }
+ #email_and_formatting > section:last-child {
+ padding-left:1.5rem;
+ }
+ #whatnottoenter .columns {
+ -webkit-columns:15rem;
+ -moz-columns:15rem;
+ columns:15rem;
+ }
+ #whatnottoenter .columns li {
+ -webkit-column-break-inside:avoid;
+ -moz-column-break-inside:avoid;
+ -o-column-break-inside:avoid;
+ break-inside:avoid;
+ }
+}
diff --git a/styles/theme-base.css b/styles/theme-base.css
index 938f398..c27d43c 100755
--- a/styles/theme-base.css
+++ b/styles/theme-base.css
@@ -471,11 +471,12 @@ hr {
/* Add a note buttons. */
#usernotes .action {
- display: block;
- top: 8px;
- right: 12px;
- position: absolute;
- text-align: right;
+ display: block;
+ top: 8px;
+ right: 12px;
+ position: absolute;
+ text-align: right;
+ z-index: 1;
}
#usernotes .foot {
@@ -1783,60 +1784,6 @@ aside.tips div.inner {
/* }}} */
-/* {{{ Adjustments for add-note.php animations */
-#add-note-usernotes
-{
- overflow: hidden;
- position: relative;
- height: 400px;
-}
-
-#add-note-usernotes .shadow
-{
- box-shadow: inset -10px 0 5px -5px rgba(0, 0, 0, 0.1);
- width:3%;
- height: 100%;
- position:absolute;
- float:right;
- z-index:1;
- left: 97%;
-}
-
-#add-note-usernotes li
-{
- margin-bottom: 1rem;
-}
-
-#add-note-usernotes #usernotes {
- position: relative;
- margin: 1rem 0 1rem 100px;
-}
-
-#whatnottoenter strong
-{
- display: block;
- text-align: left;
-}
-
-#whatnottoenter div, #add-note-usernotes li
-{
- text-align: justify;
-}
-
-#whatnottoenter div.row-fluid
-{
- margin-bottom: 1rem;
-}
-
-#whatnottoenter strong:before{
- color: #333366;
- content: '•';
- position: absolute;
- font-size: 2rem;
- margin: -0.5rem 0 0 -0.5rem;
-}
-/* }}} */
-
/* {{{ Flash message */
#flash-message {
height: auto;--
PHP Webmaster List Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
