You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ja...@apache.org on 2021/02/24 20:08:45 UTC
[lucene-site] 03/05: Move Editing website from resources page to
its own page, linked from footer. Add more video links
This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to branch main/solr
in repository https://gitbox.apache.org/repos/asf/lucene-site.git
commit fb9e507dc00e231edcbf94145cef95e9a95bbbcf
Author: Jan Høydahl <ja...@cominvent.com>
AuthorDate: Wed Feb 24 21:06:05 2021 +0100
Move Editing website from resources page to its own page, linked from footer. Add more video links
---
content/pages/editing-website.md | 38 ++++++++++++++++++++++++++++++++++++
content/pages/resources.md | 22 ++++++++++-----------
themes/solr/templates/_footer.html | 1 +
themes/solr/templates/resources.html | 1 -
4 files changed, 50 insertions(+), 12 deletions(-)
diff --git a/content/pages/editing-website.md b/content/pages/editing-website.md
new file mode 100644
index 0000000..ff896a5
--- /dev/null
+++ b/content/pages/editing-website.md
@@ -0,0 +1,38 @@
+Title: Editing this Website
+URL: editing-website.html
+save_as: editing-website.html
+template: page
+
+# Editing this Website
+
+This website is hosted in its own git repository `solr-site` (see [Github](https://github.com/apache/solr-site/) and [Gitbox](https://gitbox.apache.org/repos/asf/solr-site.git)).
+
+The content of the `main` branch will update the [staging site](https://solr.staged.apache.org) while the content of the `production` branch will be published to the main website. Read the [README.md](https://github.com/apache/solr-site/) file for further instructions.
+
+## Contributing content
+
+If you want to contribute some content or bugfix to this website, you may follow these steps:
+
+1. Fork this repository in [GitHub](https://github.com/apache/solr-site)
+2. Clone your fork to your computer
+
+ git clone https://github.com/<your-github-id>/lucene-site
+ cd lucene-site
+ git pull
+
+3. Create a new branch for your edits
+
+ git checkout -b my-typo-fix
+
+4. Edit the site following the instructions in [README](https://github.com/apache/solr-site/)
+5. When done, push your changes to your branch (in your fork)
+
+ git add .
+ git commit -m "Fixing a typo on the resources page"
+ git push origin
+
+6. Visit your fork again on GitHub, and you'll se a button to add your branch as a Pull Request
+
+For more detailed instructions, see [GitHub documentation](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request-from-a-fork).
+
+**TIP:** For very simple edits to one page only, you may find the page (markdown or html) in GitHub, then click the edit button and submit your PR directly from the UI.
diff --git a/content/pages/resources.md b/content/pages/resources.md
index 93cf710..8078b1d 100644
--- a/content/pages/resources.md
+++ b/content/pages/resources.md
@@ -43,7 +43,7 @@ Additional documentation can be found on the [Solr Community Wiki](https://cwiki
## Solr Books ##
-If you have a Solr book that you would like to see listed here, please submit a [patch](https://cwiki.apache.org/confluence/display/solr/HowToContribute) to this [website](https://svn.apache.org/viewvc/lucene/cms/trunk/) via a JIRA issue.
+If you have a Solr book that you would like to see listed here, please [edit this website add submit a Pull Request]("/editing-website.html").
<h3 class="offset" id="book-relevant-search">Relevant Search</h3>
Doug Turnbull, John Berryman and Manning Publications are proud to announce *Relevant Search*.
@@ -209,15 +209,21 @@ If you have a Solr presentation that you would like to see listed here, please s
## Videos ##
-If you have a Solr video that you would like to see listed here, please submit a [patch](https://cwiki.apache.org/confluence/display/solr/HowToContribute) via a JIRA with the appropriate content.
-
-<h3 class="offset" id="lucenesolr-revolution">Activate and Lucene/Solr Revolution</h3>
+If you have a Solr video that you would like to see listed here, please [edit this website add submit a Pull Request]("/editing-website.html").
<!-- TODO: WOULD BE NICE TO HAVE A SLIDER OR RANDOMLY PICKED VIDEO HERE -->
+<h3 class="offset" id="youtube">Conferences with Solr talks</h3>
+
+[Videos from Past ApacheCon events](https://www.youtube.com/c/TheApacheFoundation/search?query=lucene%20solr)
+
[Videos from Past Activate / Lucene/Solr revolution events](https://www.activate-conf.com/more-events)
-[Videos from Lucidwork's Eurocon](https://vimeo.com/search?q=lucene%20eurocon)
+[Videos from past Berlin Buzzwords events](https://www.youtube.com/c/PlainSchwarzUG/playlists?view=50&sort=dd&shelf_id=1)
+
+[Videos from past Haystack events (search relevance)](https://www.youtube.com/channel/UCiuXt-f2Faan4Es37nADUdQ/playlists)
+
+[Videos from Lucidwork's Lucene Eurocon](https://vimeo.com/search?q=lucene%20eurocon)
<h3 class="offset" id="youtube">YouTube</h3>
@@ -227,9 +233,3 @@ If you have a Solr video that you would like to see listed here, please submit a
[Search Vimeo for Solr](http://vimeo.com/search?q=solr)
-## Website ##
-
-This web site is hosted in its own git repository `solr-site` (see [Github](https://github.com/apache/solr-site/) and [Gitbox](https://gitbox.apache.org/repos/asf/solr-site.git)).
-
-Pushing to the `main` branch will update the [staging site](https://solr.staged.apache.org) while pushing to `production` branch will update the main web site. Read the [README.md](https://github.com/apache/solr-site/) file for further instructions.
-
diff --git a/themes/solr/templates/_footer.html b/themes/solr/templates/_footer.html
index 03c26db..aafd096 100644
--- a/themes/solr/templates/_footer.html
+++ b/themes/solr/templates/_footer.html
@@ -25,6 +25,7 @@
<li><a href="/resources.html#presentations">Presentations</a></li>
<li><a href="/resources.html#videos">Videos</a></li>
<li><a href="/logos-and-assets.html">Solr Logos and Assets</a></li>
+ <li><a href="/editing-website.html">Editing this Website</a></li>
<br/>
<li><a href="https://www.apache.org/">Apache Software Foundation</a></li>
<li><a href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
diff --git a/themes/solr/templates/resources.html b/themes/solr/templates/resources.html
index a07021d..61b9f65 100644
--- a/themes/solr/templates/resources.html
+++ b/themes/solr/templates/resources.html
@@ -8,5 +8,4 @@
<dd><a data-scroll href="#solr-books">Books</a></dd>
<dd><a data-scroll href="#presentations">Presentations</a></dd>
<dd><a data-scroll href="#videos">Videos</a></dd>
-<dd><a data-scroll href="#website">Website</a></dd>
{% endblock %}