AAL 0.5.02 - many new features

Author: theo-armour

Diff for: FEATURES.md

@@ -48,6 +48,7 @@ Completed Features are documented here, for context.
 What's out there that we want to meet or exceed?
 
 ### Mind Maps
+
 * https://en.wikipedia.org/wiki/Mind_map
 > A mind map is a diagram used to visually organize information. A mind map is hierarchical and shows relationships among pieces of the whole.[1] It is often created around a single concept, drawn as an image in the center of a blank page, to which associated representations of ideas such as images, words and parts of words are added. Major ideas are connected directly to the central concept, and other ideas branch out from those.
 

Diff for: LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 Opentecture
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

Diff for: sandbox/opentecture-bookmarks/add-a-line-bookmarks/README.md

@@ -33,11 +33,20 @@ See also [Opentecture Bookmarks View-a-line Read Me]( https://opentecture.github
 
 ## Issues
 
+* 2019-07-06 ~ Theo ~ Get themes working
 
 ## Links of Interest
 
 ## Change Log
 
+### 2019-07-06 ~ Theo
+
+Add-a-line Bookmarks v 0.5.02
+
+* Add edit button and better comment display to contents list
+* Add scraping for data in editing bm
+* Working with <TooToo14 class="04"></TooToo14>
+
 ### 2019-06-22 ~ Theo
 
 Add-a-line Bookmarks v 0.5.01

Diff for: sandbox/opentecture-bookmarks/add-a-line-bookmarks/dev-notes.md

@@ -0,0 +1,62 @@
+## dev notes
+
+
+### 2019-07-07
+
+##
+
+## The problem that needs solving
+
+* You have some knowledge you want to share with others
+* Several of you have knowledge you would like to share
+
+
+### Standing on the shoulders of Giants
+
+* Much of your knowledge is available instantly via links
+	* Via links to web pages or to ISBN references or online documents
+* Your links are selected, prioritized and commented
+* The collection of links together may be considered to form an authoritative view of the topic in question
+* The content at the link destinations generally follow [Wikipedia Core Content Policies]( https://en.wikipedia.org/wiki/Wikipedia:Core_content_policies )
+	* Neutral Point of View
+	* Verifiability
+	* No original research
+
+
+### Sharing
+
+* The knowledge in each link must be made availble with a click or twp
+* No paywalls
+* Much of the knowledge is available in small chunks
+	* Just-in-time learning
+	* Examples include most Wikipedia articles and Khan Academy's three minute videos
+
+
+### Simplicity
+
+* Easy code
+* Easy data format
+
+
+### Freedom of display
+
+* Standard two panel trees
+* 2D mind maps
+* 3D mind maps
+
+
+### Vision
+
+* Within a few hours you can gain a reasonable overview of the topic at hand
+	* Its concepts
+	* Features and benefits
+	* Current issues
+	* Major persons involved
+	* General directions
+	* [Sun Tzu]( https://medium.com/wardleymaps/on-being-lost-2ef5f05eb1ec ): purpose, landscape, climate, doctrine and leadership
+	* You are able to act and make decisions using your new knowledge
+
+### Longer term vision
+
+	* You may fork the data
+	* You may add and edit the content and comments

Diff for: sandbox/opentecture-bookmarks/add-a-line-bookmarks/index.html

@@ -6,7 +6,7 @@
 <body>
 <script>
 
-	window.location.href = './v-0-5-01/add-a-line-bookmarks.html' + location.hash;
+	window.location.href = './v-0-5-02/add-a-line-bookmarks.html' + location.hash;
 
 </script>
 </body>

Diff for: sandbox/opentecture-bookmarks/add-a-line-bookmarks/v-0-5-02/README.md

@@ -14,29 +14,45 @@ Basic bookmark manager
 
 <summary>To Do / Wish List</summary>
 
+* 2019-07-07 ~ Theo ~ Create tag chains usable to tie Mind Map elements
 * 2019-06-23 ~ Theo ~ Filter by multiple tags
 * 2019-06-23 ~ Theo ~ Filter by content
 * 2019-06-23 ~ Theo ~ Add tags to multiple bookmarks at same time
 * 2019-06-23 ~ Theo ~ Refresh memory after a deletion
 * 2019-06-23 ~ Theo ~ meta tags with description of entire project, copyright, license etc
 * 2019-06-03 ~ Theo ~ Save to and read from gists
-* 2019-06-03 ~ Theo ~ Remove dead links
+* 2019-06-03 ~ Theo ~ Remove dead links/ or retrieve version from Internet Archive
 
 </details>
 
 <details>
 
 <summary>Issues</summary>
 
-* 2019-06-23 ~ Theo ~ Adding commenys broken?
-* 2019-06-23 ~ Theo ~ Add comments by url instead of bookmark id - or keep both?
 
 </details>
 
 <details>
 
 <summary>Change Log</summary>
 
+### 2019-07-07 ~ Theo
+
+Add-a-line Bookmarks v0.5.02
+
+Content
+
+* F - BM.js: Add item numbers and date update
+* F - MET.js: first commit
+* F - AAL: Update popup text, add license and link
+
+
+Dealt with
+
+* 2019-06-23 ~ Theo ~ Adding comment broken?
+* 2019-06-23 ~ Theo ~ Add comments by url instead of bookmark id - or keep both?
+
+
 ### 2019-06-23 ~ Theo
 
 * Many fixes / looking even better / almost workable

Diff for: sandbox/opentecture-bookmarks/add-a-line-bookmarks/v-0-5-02/add-a-line-bookmarks.html

@@ -33,7 +33,7 @@
 .container > div > textarea { height: 5rem; width: 100% }
 .container4 > div > input { width: 100% }
 
-#TAGtxtJson, #BMEtxtJson, #COMtxtJson { height: 10rem; width: 100%; }
+#TAGtxtJson, #BMEtxtJson, #COMtxtJson, #METtxtJson { height: 10rem; width: 100%; }
 
 #BMNdivDrop { border: 1px dotted #aaaaaa; height: 3rem; padding: 1rem; width: 100%; }
 
@@ -62,8 +62,10 @@
 
 <!-- Edit Menu -->
 
-<!-- Settings menu -->
-<script src = "https://pushme-pullyou.github.io/tootoo14/js-14-04/thm-theme/thm-theme.js" ></script>
+<!-- Settings menu
+
+	<script src = "https://pushme-pullyou.github.io/tootoo14/js-14-04/thm-theme/thm-theme.js" ></script>
+-->
 <script src = "https://pushme-pullyou.github.io/tootoo14/js-14-04/tmp-template/tmp-template.js" ></script>
 
 <script src = "js/bm-bookmarks.js" ></script>
@@ -72,6 +74,7 @@
 <script src = "js/tga-tags-add.js" ></script>
 <script src = "js/tag-tags.js" ></script>
 <script src = "js/com-comments.js" ></script>
+<script src = "js/met-meta.js" ></script>
 
 <script src = "js/bdm-bookmarks-by-domain.js" ></script>
 <script src = "js/btg-bookmarks-by-tag.js" ></script>
@@ -242,16 +245,16 @@ <h1 onclick="navPanel.scrollTop=0;" style="cursor:pointer;text-align:center;" ti
 
 	document.body.addEventListener( 'FOBonJsonFileLoad', BM.onLoad, false );
 
-
 	POP.init();
 
 	//COR.init();
 
 	POP.setPopupShowHide( butPopupClose, "popup.md" );
 
 	butPopupClose.classList.remove( 'active' );
-	main.addEventListener( 'click', POP.onClickClose, false );
-	main.addEventListener( 'touchstart', POP.onClickClose, false );
+
+	//main.addEventListener( 'click', POP.onClickClose, false );
+	//main.addEventListener( 'touchstart', POP.onClickClose, false );
 
 	//BMNdivDrop.addEventListener( "input", BMN.onInput, false);
 

Diff for: sandbox/opentecture-bookmarks/add-a-line-bookmarks/v-0-5-02/js/bm-bookmarks.js

@@ -33,6 +33,11 @@ BM.onLoad = function() {
 	}
 	//console.log( 'BM.jsonLines', BM.jsonLines.length );
 
+	const metatags = BM.lines.filter( line => line.includes( `"type":"meta"` ) );
+	//console.log( 'metatags', metatags );
+
+	BM.metatags = metatags.map( metatag => JSON.parse( metatag ) ) || [];
+
 	BM.setBookmarks();
 
 
@@ -45,14 +50,22 @@ BM.setBookmarks = function ( bookmarks = BM.jsonLines ) {
 	const a = document.createElement( 'a' );
 	const subdomains = ["www.", "m.", "en." ];
 
-	htm = `<h1>Bookmarks from: ${ FOB.urlDefaultFile }</h1>`;
+	const title = BM.metatags.find( meta => meta.tags.includes( "title" ) ).text || "title";
+	const subtitle = BM.metatags.find( meta => meta.tags.includes( "subtitle" ) ).text || "subtitle";
+	const copyright = BM.metatags.find( meta => meta.tags.includes( "copyright" ) ).text || "copyright";
+	const license = BM.metatags.find( meta => meta.tags.includes( "license" ) ).text || "license";
+
+	let htm =
+		`<h1>${ title }</h1>
+		<p><i>${ subtitle }. ${copyright }. ${ license }.</i></p>`;
 
 	const comments = BM.lines.filter( line => line.includes( `"type":"comment"` ) );
 	//console.log( 'comments', comments );
 
 	BM.comments = comments.map( comment => JSON.parse( comment ) ) || [];
 
-	bookmarks.forEach( (bookmark ) => {
+	count = 1;
+	bookmarks.forEach( bookmark => {
 
 		if ( bookmark.type === "url" ) {
 
@@ -72,14 +85,17 @@ BM.setBookmarks = function ( bookmarks = BM.jsonLines ) {
 
 			htm +=
 			`<p>
-				 <a href=${bookmark.url } target="_blank" >
+				${ count++ } <a href=${bookmark.url } target="_blank" >
 					 <img src="${ bookmark.favicon }" height=16px >
 					<b>${ bookmark.name }</b> - <i>${ site }</i>
 				</a><br>
-				tags: <i>${ bookmark.tags }</i> - added: ${ bookmark.dateAdd.slice( 0, 10 ) }<br>
+				tags: <i>${ bookmark.tags }</i>
+				- added: ${ bookmark.dateAdd.slice( 0, 10 ) }
+				- update: ${ bookmark.dateUpdate.slice( 0, 10 ) }
+				<br>
 				${ bookmark.description.startsWith ("No description" ) ? "" : bookmark.description }
 				<p style=color:blue ><button onclick="BM.setContents(${ index });" >edit</button>
-				${ comment.text ? ( "comment: " + comment.text + " tags: " + comment.tags ) : "" }</p>
+				${ comment.text ? ( "comment: " + comment.text + " / tags: " + comment.tags ) : "" }</p>
 				<hr>
 			</p>`;
 
@@ -93,35 +109,7 @@ BM.setBookmarks = function ( bookmarks = BM.jsonLines ) {
 
 
 
-BM.xxxgetBookmarks = function () {
-	//console.log( '', FOB.text );
-
-	BM.lines = FOB.text.split(/\r\n|\n/);
-
-	BM.jsonLines = [];
-
-	for ( let line of BM.lines ) {
-		//console.log( 'line', line );
-
-		if ( line.slice( 0, 1 ) !== "{" ) { continue; }
 
-		const jsonl = JSON.parse( line );
-		//console.log( 'jsonl', jsonl );
-
-		BM.jsonLines.push( jsonl );
-
-	}
-
-	const comments = BM.lines.filter( line => line.includes( `"type":"comment"` ) );
-	//console.log( 'comments', comments );
-
-	BM.comments = comments.map( comment => JSON.parse( comment ) ) || [];
-
-	//BM.setBookmarks();
-
-	BBF.setMenuItemsByUrl();
-
-};
 
 
 
@@ -142,6 +130,8 @@ BM.setContents = function ( index ) {
 	<div id=TGAdivTagsAdd ></div>
 
 	<div id=TAGdivTagSets ></div>
+
+	<div id=METdivMetaAdd ></div>
 	`;
 
 	divContents.innerHTML = htm;
@@ -158,6 +148,7 @@ BM.setContents = function ( index ) {
 
 	TAGdivTagSets.innerHTML = TAG.getMenuTagSets();
 
+	METdivMetaAdd.innerHTML = MET.getMenuMetaAdd();
 
 	BM.parseJson( index );
 
@@ -205,6 +196,12 @@ BM.parseJson = function( index ) {
 
 	}
 
+	const metatags = BM.lines.filter( line => line.includes( `"type":"meta"` ) );
+	//console.log( 'metatags', metatags );
+
+	BM.metatags = metatags.map( metatag => JSON.parse( metatag ) ) || [];
+
+
 	BMEtxtJson.value = "";
 	COM.onToggle();
 

Diff for: sandbox/opentecture-bookmarks/add-a-line-bookmarks/v-0-5-02/js/bme-bookmarks-edit.js

@@ -60,7 +60,7 @@ BME.setTextareaJson = function() {
 	"url": "${ BMinpUrl.value }",
 	"name": "${ BMinpName.value }",
 	"dateAdd": "${ BMinpDateAdd.value }",
-	"dateUpdate": "${ BMinpDateUpdate.value }",
+	"dateUpdate": "${ new Date().toISOString() }",
 	"id": "${ BMinpId.value }",
 	"type": "${ BMinpType.value }",
 	"images": [ ${ BMinpImages.value } ],