From 568df51ce513f7026cbe2a0b5bc166906e8ed769 Mon Sep 17 00:00:00 2001 From: Ben Goldsworthy Date: Thu, 5 Oct 2023 19:27:13 +0100 Subject: [PATCH] add Schema.org markup --- assets/css/base/_typography.scss | 87 +- assets/css/components/icons.scss | 16 +- content/books/2023-09-02-rojava-anarchists.md | 2 +- content/games/current/_index.md | 5 + data/books/current.json | 19 +- data/books/log.json | 2 + data/films/log.json | 15 +- data/films/wishlist.json | 6 - data/games/log.json | 11 +- data/itemtypes.json | 1363 +++++++++++++++++ data/tv/log.json | 6 + layouts/_default/list.html | 2 +- layouts/_default/section.html | 4 +- layouts/partials/books/publication-year.html | 7 + layouts/partials/books/table-body.html | 48 +- layouts/partials/cite.html | 16 + layouts/partials/films/table-body.html | 10 +- layouts/partials/games/table-body.html | 110 +- layouts/partials/header/site-header.html | 2 +- layouts/partials/tv/table-body.html | 12 +- package.json | 4 +- static/images/feed-icon.png | Bin 0 -> 14773 bytes static/images/feed-icon.svg | 18 + 23 files changed, 1638 insertions(+), 127 deletions(-) create mode 100644 content/games/current/_index.md create mode 100644 data/itemtypes.json create mode 100644 layouts/partials/books/publication-year.html create mode 100644 layouts/partials/cite.html create mode 100644 static/images/feed-icon.png create mode 100644 static/images/feed-icon.svg diff --git a/assets/css/base/_typography.scss b/assets/css/base/_typography.scss index aaeb637..11d2331 100644 --- a/assets/css/base/_typography.scss +++ b/assets/css/base/_typography.scss @@ -140,6 +140,82 @@ cite.article--shortcite::after { content: none; } +// Schema.org citations + +cite, +.cite { + font-style: italic; + + &[itemtype$="Code"], + &[itemtype$="SocialMediaPosting"], + &[itemtype$="SoftwareApplication"], + &[itemtype$="WebSite"], + &[itemtype$="WebContent"], + &[itemtype$="CreativeWorkSeason"], + &[itemtype$="PodcastSeason"], + &[itemtype$="RadioSeason"], + &[itemtype$="TVSeason"], + &[itemtype$="CreativeWorkSeries"], + &[itemtype$="BookSeries"], + &[itemtype$="MovieSeries"], + &[itemtype$="VideoGameSeries"], + &[itemtype$="Legislation"], + &--inherit { + font-style: inherit; + } + + &[itemtype$="Article"], + &[itemtype$="BlogPosting"], + &[itemtype$="NewsArticle"], + &[itemtype$="AnalysisNewsArticle"], + &[itemtype$="ReportageNewsArticle"], + &[itemtype$="OpinionNewsArticle"], + &[itemtype$="ScholarlyArticle"], + &[itemtype$="TechArticle"], + &[itemtype$="Chapter"], + &[itemtype$="Clip"], + &[itemtype$="MovieClip"], + &[itemtype$="RadioClip"], + &[itemtype$="TVClip"], + &[itemtype$="VideoGameClip"], + &[itemtype$="Comment"], + &[itemtype$="Course"], + &[itemtype$="DigitalDocument"], + &[itemtype$="NoteDigitalDocument"], + &[itemtype$="PresentationDigitalDocument"], + &[itemtype$="TextDigitalDocument"], + &[itemtype$="Episode"], + &[itemtype$="PodcastEpisode"], + &[itemtype$="RadioEpisode"], + &[itemtype$="TVEpisode"], + &[itemtype$="MusicRecording"], + &[itemtype$="MusicComposition"], + &[itemtype$="Message"], + &--enquote { + font-style: normal; + + &::before { + content: "“"; + } + + &::after { + content: "”"; + } + } + + &--normal { + font-style: normal !important; + + &::before { + content: none !important; + } + + &::after { + content: none !important; + } + } +} + .episode-number, .authors--addtional, .year--original { @@ -226,8 +302,11 @@ kbd { white-space: nowrap; } -.pre-nominals, -.post-nominals { - font-size: 0.6em; - font-variant: small-caps; +/* + * Special Text + */ + +:where([title]) { + text-decoration: underline; + text-decoration: underline dotted; } diff --git a/assets/css/components/icons.scss b/assets/css/components/icons.scss index c07d875..2bc4b5d 100644 --- a/assets/css/components/icons.scss +++ b/assets/css/components/icons.scss @@ -1,6 +1,10 @@ -.feed-icon { - display: inline-block; - height: 0.6em; - width: 0.6em; - margin-bottom: 0.2em; -} +.feed-icon { + display: inline-block; + height: 1em; + width: 1em; + margin-bottom: 0.2em; +} + +.site-header__icons a { + text-decoration: none; +} diff --git a/content/books/2023-09-02-rojava-anarchists.md b/content/books/2023-09-02-rojava-anarchists.md index 4bfd4f8..d73efb9 100644 --- a/content/books/2023-09-02-rojava-anarchists.md +++ b/content/books/2023-09-02-rojava-anarchists.md @@ -1,5 +1,5 @@ --- -title: 'Rojava Anarchists: On eYear Since the Turkish Invasion of Rojava: An Interview with Tekoşîna Anarşîst' +title: 'Rojava Anarchists: One Year Since the Turkish Invasion of Rojava: An Interview with Tekoşîna Anarşîst' date: 2023-09-02 --- diff --git a/content/games/current/_index.md b/content/games/current/_index.md new file mode 100644 index 0000000..5b36061 --- /dev/null +++ b/content/games/current/_index.md @@ -0,0 +1,5 @@ +--- +title: Current Games +--- + +All the games I'm currently playing diff --git a/data/books/current.json b/data/books/current.json index 429d4cf..6e0dec7 100644 --- a/data/books/current.json +++ b/data/books/current.json @@ -1,21 +1,28 @@ [ { "Title": "The Field Guide to Understanding ‘Human Error’", + "Edition": "Third Edition", "Author": "Sidney Dekker", "Date Added": "2023-07-14", - "Date Started": "2023-09-25" + "Date Started": "2023-09-25", + "Year Published": "2017", + "Original Publication Year": "2014" }, { "Title": "Hillwalking", "Author": "Steve Long", + "Edition": "Third Edition", "Date Added": "2023-09-30", - "Date Started": "2023-09-18" + "Date Started": "2023-09-18", + "Year Published": "2014", + "Original Publication Year": "2003" }, { "Title": "Everyday Stalinism: Ordinary Life in Extraordinary Times: Soviet Russia in the 1930s", "Author": "Sheila Fitzpatrick", "Date Added": "2023-06-30", - "Date Started": "2023-09-18" + "Date Started": "2023-09-13", + "Year Published": "1999" }, { "Additional Authors": "Aleida Guevara March", @@ -26,10 +33,12 @@ "Date Started": "2023-05-11", "ISBN13": "9781920888114", "Number of Pages": 163, - "Original Publication Year": "", + "Original Publication Year": "1993", "Publisher": "Ocean Sur", "Read Count": 0, "Title": "Diarios de Motocicleta: Notas de Viaje por América Latina", + "TitleLang": "es", + "TitleTrans": "The Motorcycle Diaries: Notes on a Latin American Journey", "Year Published": "2004" }, { @@ -41,7 +50,7 @@ "Date Started": "2023-05-17", "ISBN13": "9781876175702", "Number of Pages": 241, - "Original Publication Year": "1992", + "Original Publication Year": "1993", "Publisher": "Ocean Press", "Read Count": 0, "Title": "The Motorcycle Diaries: Notes on a Latin American Journey", diff --git a/data/books/log.json b/data/books/log.json index 8e9e5bc..cd14fe0 100644 --- a/data/books/log.json +++ b/data/books/log.json @@ -1846,6 +1846,8 @@ }, { "Title": "La Peste", + "TitleLang": "fr", + "TitleTrans": "The Plague", "Author": "Albert Camus", "ISBN": null, "ISBN13": null, diff --git a/data/films/log.json b/data/films/log.json index e9980b9..a9acfe2 100644 --- a/data/films/log.json +++ b/data/films/log.json @@ -1,17 +1,24 @@ [ + { + "Date Added": "2022-04-03", + "Title": "The Memory of Justice", + "Release Year": "1976", + "Letterboxd URI": "https://boxd.it/36u2", + "Date Watched": "2023-10-05" + }, { "Date Added": "2023-09-30", "Title": "Reservoir Dogs", "Release Year": "1991", "Letterboxd URI": "https://www.imdb.com/title/tt6493238/", - "Date Watched": "2022-09-15" + "Date Watched": "2023-09-15" }, { "Date Added": "2023-08-31", "Title": "The Deepest Breath", "Release Year": "2023", "Letterboxd URI": "https://www.imdb.com/title/tt24132732/", - "Date Watched": "2022-08-27" + "Date Watched": "2023-08-27" }, { "Date Added": "2022-01-04", @@ -19,7 +26,7 @@ "Release Year": "2021", "Letterboxd URI": "https://boxd.it/2qX5PV", "Rewatch": true, - "Date Watched": "2022-08-27", + "Date Watched": "2023-08-27", "Comments": "Still an impressive achievement, but it's amazing how quickly this has aged." }, { @@ -103,6 +110,8 @@ { "Date Added": "2023-07-09", "Title": "Tout va bien", + "TitleLang": "fr", + "TitleTrans": "All's Well", "Release Year": "1972", "Letterboxd URI": "https://www.imdb.com/title/tt0069398/", "Rewatch": false, diff --git a/data/films/wishlist.json b/data/films/wishlist.json index 2c8811e..47d4a27 100644 --- a/data/films/wishlist.json +++ b/data/films/wishlist.json @@ -18801,12 +18801,6 @@ "Release Year": "1988", "Letterboxd URI": "https://boxd.it/3Die" }, - { - "Date Added": "2022-04-03", - "Title": "The Memory of Justice", - "Release Year": "1976", - "Letterboxd URI": "https://boxd.it/36u2" - }, { "Date Added": "2022-04-12", "Title": "Good Copy Bad Copy", diff --git a/data/games/log.json b/data/games/log.json index 96d1c7c..995c6a3 100644 --- a/data/games/log.json +++ b/data/games/log.json @@ -4,6 +4,7 @@ "Series": "Halo", "Date Started": "2023-09-15", "Date Finished": "2023-10-02", + "Platforms": "PC", "Level of Completion": "Main Story", "Developers": "Bungie", "Date Released": "2009-09-22", @@ -21,6 +22,7 @@ "Title": "Mountain", "Date Started": "2023-09-04", "Date Finished": "2023-09-04", + "Platforms": "PC", "Developers": "David O'Reilly", "Date Released": "2014-07-01", "GiantBomb ID": "46636" @@ -28,6 +30,7 @@ { "Title": "Halo 2", "Date Started": "2023-09-01", + "Platforms": "PC", "Date Finished": "2023-09-04", "Developers": "Bungie", "Date Released": "2004-11-09", @@ -36,7 +39,8 @@ }, { "Title": "Metro Exodus", - "Date Started": "2023-08-13", + "Date Started": "2023-08-13", + "Platforms": "PC", "Date Finished": "2023-08-23", "Developers": "4A Games", "Date Released": "2019-02-15", @@ -45,6 +49,7 @@ }, { "Title": "Halo: Reach", + "Platforms": "PC", "Date Started": "2023-08-08", "Date Finished": "2023-08-10", "Level of Completion": "Main Story", @@ -113,9 +118,11 @@ }, { "Title": "CROAR: Cronopios Autónomos Rebeldes", + "TitleLang": "es", + "TitleTrans": "CROAR: Rebel Autonomous Cronopios", "Platforms": "Board Games", "Developers": "SERALZ", - "Date Released": "", + "Date Released": "Unknown", "Date Started": "2023-06-07", "Date Finished": "2023-06-07" }, diff --git a/data/itemtypes.json b/data/itemtypes.json new file mode 100644 index 0000000..02b2303 --- /dev/null +++ b/data/itemtypes.json @@ -0,0 +1,1363 @@ +[ +"3DModel", +"AMRadioChannel", +"APIReference", +"Abdomen", +"AboutPage", +"AcceptAction", +"Accommodation", +"AccountingService", +"AchieveAction", +"Action", +"ActionAccessSpecification", +"ActionStatusType", +"ActivateAction", +"ActivationFee", +"ActiveActionStatus", +"ActiveNotRecruiting", +"AddAction", +"AdministrativeArea", +"AdultEntertainment", +"AdultOrientedEnumeration", +"AdvertiserContentArticle", +"AerobicActivity", +"AggregateOffer", +"AggregateRating", +"AgreeAction", +"Airline", +"Airport", +"AlbumRelease", +"AlcoholConsideration", +"AlignmentObject", +"AllWheelDriveConfiguration", +"AllergiesHealthAspect", +"AllocateAction", +"AmpStory", +"AmusementPark", +"AnaerobicActivity", +"AnalysisNewsArticle", +"AnatomicalStructure", +"AnatomicalSystem", +"AndroidPlatform", +"Anesthesia", +"AnimalShelter", +"Answer", +"Apartment", +"ApartmentComplex", +"Appearance", +"AppendAction", +"ApplyAction", +"ApprovedIndication", +"Aquarium", +"ArchiveComponent", +"ArchiveOrganization", +"ArriveAction", +"ArtGallery", +"Artery", +"Article", +"AskAction", +"AskPublicNewsArticle", +"AssessAction", +"AssignAction", +"Atlas", +"Attorney", +"Audience", +"AudioObject", +"AudioObjectSnapshot", +"Audiobook", +"AudiobookFormat", +"AuthoritativeLegalValue", +"AuthorizeAction", +"AutoBodyShop", +"AutoDealer", +"AutoPartsStore", +"AutoRental", +"AutoRepair", +"AutoWash", +"AutomatedTeller", +"AutomotiveBusiness", +"Ayurvedic", +"BackOrder", +"BackgroundNewsArticle", +"Bacteria", +"Bakery", +"Balance", +"BankAccount", +"BankOrCreditUnion", +"BarOrPub", +"Barcode", +"BasicIncome", +"Beach", +"BeautySalon", +"BedAndBreakfast", +"BedDetails", +"BedType", +"BefriendAction", +"BenefitsHealthAspect", +"BikeStore", +"BioChemEntity", +"Blog", +"BlogPosting", +"BloodTest", +"BoardingPolicyType", +"BoatReservation", +"BoatTerminal", +"BoatTrip", +"BodyMeasurementArm", +"BodyMeasurementBust", +"BodyMeasurementChest", +"BodyMeasurementFoot", +"BodyMeasurementHand", +"BodyMeasurementHead", +"BodyMeasurementHeight", +"BodyMeasurementHips", +"BodyMeasurementInsideLeg", +"BodyMeasurementNeck", +"BodyMeasurementTypeEnumeration", +"BodyMeasurementUnderbust", +"BodyMeasurementWaist", +"BodyMeasurementWeight", +"BodyOfWater", +"Bone", +"Book", +"BookFormatType", +"BookSeries", +"BookStore", +"BookmarkAction", +"Boolean", +"BorrowAction", +"BowlingAlley", +"BrainStructure", +"Brand", +"BreadcrumbList", +"Brewery", +"Bridge", +"BroadcastChannel", +"BroadcastEvent", +"BroadcastFrequencySpecification", +"BroadcastRelease", +"BroadcastService", +"BrokerageAccount", +"BuddhistTemple", +"BusOrCoach", +"BusReservation", +"BusStation", +"BusStop", +"BusTrip", +"BusinessAudience", +"BusinessEntityType", +"BusinessEvent", +"BusinessFunction", +"BusinessSupport", +"BuyAction", +"CDCPMDRecord", +"CDFormat", +"CT", +"CableOrSatelliteService", +"CafeOrCoffeeShop", +"Campground", +"CampingPitch", +"Canal", +"CancelAction", +"Car", +"CarUsageType", +"Cardiovascular", +"CardiovascularExam", +"CaseSeries", +"Casino", +"CassetteFormat", +"CategoryCode", +"CategoryCodeSet", +"CatholicChurch", +"CausesHealthAspect", +"Cemetery", +"Chapter", +"CharitableIncorporatedOrganization", +"CheckAction", +"CheckInAction", +"CheckOutAction", +"CheckoutPage", +"ChemicalSubstance", +"ChildCare", +"ChildrensEvent", +"Chiropractic", +"ChooseAction", +"Church", +"City", +"CityHall", +"CivicStructure", +"Claim", +"ClaimReview", +"Class", +"CleaningFee", +"Clinician", +"Clip", +"ClothingStore", +"CoOp", +"Code", +"CohortStudy", +"Collection", +"CollectionPage", +"CollegeOrUniversity", +"ComedyClub", +"ComedyEvent", +"ComicCoverArt", +"ComicIssue", +"ComicSeries", +"ComicStory", +"Comment", +"CommentAction", +"CommentPermission", +"CommunicateAction", +"CommunityHealth", +"CompilationAlbum", +"CompleteDataFeed", +"Completed", +"CompletedActionStatus", +"CompoundPriceSpecification", +"ComputerLanguage", +"ComputerStore", +"ConfirmAction", +"Consortium", +"ConstraintNode", +"ConsumeAction", +"ContactPage", +"ContactPoint", +"ContactPointOption", +"ContagiousnessHealthAspect", +"Continent", +"ControlAction", +"ConvenienceStore", +"Conversation", +"CookAction", +"Corporation", +"CorrectionComment", +"Country", +"Course", +"CourseInstance", +"Courthouse", +"CoverArt", +"CovidTestingFacility", +"CreateAction", +"CreativeWork", +"CreativeWorkSeason", +"CreativeWorkSeries", +"CreditCard", +"Crematorium", +"CriticReview", +"CrossSectional", +"CssSelectorType", +"CurrencyConversionService", +"DDxElement", +"DJMixAlbum", +"DVDFormat", +"DamagedCondition", +"DanceEvent", +"DanceGroup", +"DangerousGoodConsideration", +"DataCatalog", +"DataDownload", +"DataFeed", +"DataFeedItem", +"DataType", +"Dataset", +"Date", +"DateTime", +"DatedMoneySpecification", +"DayOfWeek", +"DaySpa", +"DeactivateAction", +"DecontextualizedContent", +"DefenceEstablishment", +"DefinedRegion", +"DefinedTerm", +"DefinedTermSet", +"DefinitiveLegalValue", +"DeleteAction", +"DeliveryChargeSpecification", +"DeliveryEvent", +"DeliveryMethod", +"DeliveryTimeSettings", +"Demand", +"DemoAlbum", +"DemoGameAvailability", +"Dentist", +"Dentistry", +"DepartAction", +"DepartmentStore", +"DepositAccount", +"Dermatologic", +"Dermatology", +"DesktopWebPlatform", +"DiabeticDiet", +"Diagnostic", +"DiagnosticLab", +"DiagnosticProcedure", +"Diet", +"DietNutrition", +"DietarySupplement", +"DigitalAudioTapeFormat", +"DigitalDocument", +"DigitalDocumentPermission", +"DigitalDocumentPermissionType", +"DigitalFormat", +"DigitalPlatformEnumeration", +"DisabilitySupport", +"DisagreeAction", +"Discontinued", +"DiscoverAction", +"DiscussionForumPosting", +"DislikeAction", +"Distance", +"DistanceFee", +"Distillery", +"DonateAction", +"DoseSchedule", +"DoubleBlindedTrial", +"DownloadAction", +"Downpayment", +"DrawAction", +"Drawing", +"DrinkAction", +"DriveWheelConfigurationValue", +"DrivingSchoolVehicleUsage", +"Drug", +"DrugClass", +"DrugCost", +"DrugCostCategory", +"DrugLegalStatus", +"DrugPregnancyCategory", +"DrugPrescriptionStatus", +"DrugStrength", +"DryCleaningOrLaundry", +"Duration", +"EBook", +"EPRelease", +"EUEnergyEfficiencyCategoryA", +"EUEnergyEfficiencyCategoryA1Plus", +"EUEnergyEfficiencyCategoryA2Plus", +"EUEnergyEfficiencyCategoryA3Plus", +"EUEnergyEfficiencyCategoryB", +"EUEnergyEfficiencyCategoryC", +"EUEnergyEfficiencyCategoryD", +"EUEnergyEfficiencyCategoryE", +"EUEnergyEfficiencyCategoryF", +"EUEnergyEfficiencyCategoryG", +"EUEnergyEfficiencyEnumeration", +"Ear", +"EatAction", +"EditedOrCroppedContent", +"EducationEvent", +"EducationalAudience", +"EducationalOccupationalCredential", +"EducationalOccupationalProgram", +"EducationalOrganization", +"EffectivenessHealthAspect", +"Electrician", +"ElectronicsStore", +"ElementarySchool", +"EmailMessage", +"Embassy", +"Emergency", +"EmergencyService", +"EmployeeRole", +"EmployerAggregateRating", +"EmployerReview", +"EmploymentAgency", +"Endocrine", +"EndorseAction", +"EndorsementRating", +"Energy", +"EnergyConsumptionDetails", +"EnergyEfficiencyEnumeration", +"EnergyStarCertified", +"EnergyStarEnergyEfficiencyEnumeration", +"EngineSpecification", +"EnrollingByInvitation", +"EntertainmentBusiness", +"EntryPoint", +"Enumeration", +"Episode", +"Event", +"EventAttendanceModeEnumeration", +"EventCancelled", +"EventMovedOnline", +"EventPostponed", +"EventRescheduled", +"EventReservation", +"EventScheduled", +"EventSeries", +"EventStatusType", +"EventVenue", +"EvidenceLevelA", +"EvidenceLevelB", +"EvidenceLevelC", +"ExampleMeasurementMethodEnum", +"ExchangeRateSpecification", +"ExchangeRefund", +"ExerciseAction", +"ExerciseGym", +"ExercisePlan", +"ExhibitionEvent", +"Eye", +"FAQPage", +"FDAcategoryA", +"FDAcategoryB", +"FDAcategoryC", +"FDAcategoryD", +"FDAcategoryX", +"FDAnotEvaluated", +"FMRadioChannel", +"FailedActionStatus", +"False", +"FastFoodRestaurant", +"Female", +"Festival", +"FilmAction", +"FinancialProduct", +"FinancialService", +"FindAction", +"FireStation", +"Flexibility", +"Flight", +"FlightReservation", +"Float", +"FloorPlan", +"Florist", +"FollowAction", +"FoodEstablishment", +"FoodEstablishmentReservation", +"FoodEvent", +"FoodService", +"FourWheelDriveConfiguration", +"FreeReturn", +"Friday", +"FrontWheelDriveConfiguration", +"FullGameAvailability", +"FullRefund", +"FundingAgency", +"FundingScheme", +"Fungus", +"FurnitureStore", +"Game", +"GameAvailabilityEnumeration", +"GamePlayMode", +"GameServer", +"GameServerStatus", +"GardenStore", +"GasStation", +"Gastroenterologic", +"GatedResidenceCommunity", +"GenderType", +"Gene", +"GeneralContractor", +"GenericWebPlatform", +"Genetic", +"Genitourinary", +"GeoCircle", +"GeoCoordinates", +"GeoShape", +"GeospatialGeometry", +"Geriatric", +"GettingAccessHealthAspect", +"GiveAction", +"GlutenFreeDiet", +"GolfCourse", +"GovernmentBenefitsType", +"GovernmentBuilding", +"GovernmentOffice", +"GovernmentOrganization", +"GovernmentPermit", +"GovernmentService", +"Grant", +"GraphicNovel", +"GroceryStore", +"GroupBoardingPolicy", +"Guide", +"Gynecologic", +"HVACBusiness", +"Hackathon", +"HairSalon", +"HalalDiet", +"Hardcover", +"HardwareStore", +"Head", +"HealthAndBeautyBusiness", +"HealthAspectEnumeration", +"HealthCare", +"HealthClub", +"HealthInsurancePlan", +"HealthPlanCostSharingSpecification", +"HealthPlanFormulary", +"HealthPlanNetwork", +"HealthTopicContent", +"HealthcareConsideration", +"HearingImpairedSupported", +"Hematologic", +"HighSchool", +"HinduDiet", +"HinduTemple", +"HobbyShop", +"HomeAndConstructionBusiness", +"HomeGoodsStore", +"Homeopathic", +"Hospital", +"Hostel", +"Hotel", +"HotelRoom", +"House", +"HousePainter", +"HowItWorksHealthAspect", +"HowOrWhereHealthAspect", +"HowTo", +"HowToDirection", +"HowToItem", +"HowToSection", +"HowToStep", +"HowToSupply", +"HowToTip", +"HowToTool", +"HyperToc", +"HyperTocEntry", +"IOSPlatform", +"IceCreamShop", +"IgnoreAction", +"ImageGallery", +"ImageObject", +"ImageObjectSnapshot", +"ImagingTest", +"InForce", +"InStock", +"InStoreOnly", +"IndividualProduct", +"Infectious", +"InfectiousAgentClass", +"InfectiousDisease", +"InformAction", +"IngredientsHealthAspect", +"InsertAction", +"InstallAction", +"Installment", +"InsuranceAgency", +"Intangible", +"Integer", +"InteractAction", +"InteractionCounter", +"InternationalTrial", +"InternetCafe", +"InvestmentFund", +"InvestmentOrDeposit", +"InviteAction", +"Invoice", +"InvoicePrice", +"ItemAvailability", +"ItemList", +"ItemListOrderAscending", +"ItemListOrderDescending", +"ItemListOrderType", +"ItemListUnordered", +"ItemPage", +"JewelryStore", +"JobPosting", +"JoinAction", +"Joint", +"KosherDiet", +"LaboratoryScience", +"LakeBodyOfWater", +"Landform", +"LandmarksOrHistoricalBuildings", +"Language", +"LaserDiscFormat", +"LearningResource", +"LeaveAction", +"LeftHandDriving", +"LegalForceStatus", +"LegalService", +"LegalValueLevel", +"Legislation", +"LegislationObject", +"LegislativeBuilding", +"LeisureTimeActivity", +"LendAction", +"Library", +"LibrarySystem", +"LifestyleModification", +"Ligament", +"LikeAction", +"LimitedAvailability", +"LimitedByGuaranteeCharity", +"LinkRole", +"LiquorStore", +"ListItem", +"ListPrice", +"ListenAction", +"LiteraryEvent", +"LiveAlbum", +"LiveBlogPosting", +"LivingWithHealthAspect", +"LoanOrCredit", +"LocalBusiness", +"LocationFeatureSpecification", +"LockerDelivery", +"Locksmith", +"LodgingBusiness", +"LodgingReservation", +"Longitudinal", +"LoseAction", +"LowCalorieDiet", +"LowFatDiet", +"LowLactoseDiet", +"LowSaltDiet", +"Lung", +"LymphaticVessel", +"MRI", +"MSRP", +"Male", +"Manuscript", +"Map", +"MapCategoryType", +"MarryAction", +"Mass", +"MathSolver", +"MaximumDoseSchedule", +"MayTreatHealthAspect", +"MeasurementMethodEnum", +"MeasurementTypeEnumeration", +"MediaGallery", +"MediaManipulationRatingEnumeration", +"MediaObject", +"MediaReview", +"MediaReviewItem", +"MediaSubscription", +"MedicalAudience", +"MedicalAudienceType", +"MedicalBusiness", +"MedicalCause", +"MedicalClinic", +"MedicalCode", +"MedicalCondition", +"MedicalConditionStage", +"MedicalContraindication", +"MedicalDevice", +"MedicalDevicePurpose", +"MedicalEntity", +"MedicalEnumeration", +"MedicalEvidenceLevel", +"MedicalGuideline", +"MedicalGuidelineContraindication", +"MedicalGuidelineRecommendation", +"MedicalImagingTechnique", +"MedicalIndication", +"MedicalIntangible", +"MedicalObservationalStudy", +"MedicalObservationalStudyDesign", +"MedicalOrganization", +"MedicalProcedure", +"MedicalProcedureType", +"MedicalResearcher", +"MedicalRiskCalculator", +"MedicalRiskEstimator", +"MedicalRiskFactor", +"MedicalRiskScore", +"MedicalScholarlyArticle", +"MedicalSign", +"MedicalSignOrSymptom", +"MedicalSpecialty", +"MedicalStudy", +"MedicalStudyStatus", +"MedicalSymptom", +"MedicalTest", +"MedicalTestPanel", +"MedicalTherapy", +"MedicalTrial", +"MedicalTrialDesign", +"MedicalWebPage", +"MedicineSystem", +"MeetingRoom", +"MensClothingStore", +"Menu", +"MenuItem", +"MenuSection", +"MerchantReturnEnumeration", +"MerchantReturnFiniteReturnWindow", +"MerchantReturnNotPermitted", +"MerchantReturnPolicy", +"MerchantReturnPolicySeasonalOverride", +"MerchantReturnUnlimitedWindow", +"MerchantReturnUnspecified", +"Message", +"MiddleSchool", +"Midwifery", +"MinimumAdvertisedPrice", +"MisconceptionsHealthAspect", +"MixedEventAttendanceMode", +"MixtapeAlbum", +"MobileApplication", +"MobilePhoneStore", +"MobileWebPlatform", +"MolecularEntity", +"Monday", +"MonetaryAmount", +"MonetaryAmountDistribution", +"MonetaryGrant", +"MoneyTransfer", +"MortgageLoan", +"Mosque", +"Motel", +"Motorcycle", +"MotorcycleDealer", +"MotorcycleRepair", +"MotorizedBicycle", +"Mountain", +"MoveAction", +"Movie", +"MovieClip", +"MovieRentalStore", +"MovieSeries", +"MovieTheater", +"MovingCompany", +"MultiCenterTrial", +"MultiPlayer", +"MulticellularParasite", +"Muscle", +"Musculoskeletal", +"MusculoskeletalExam", +"Museum", +"MusicAlbum", +"MusicAlbumProductionType", +"MusicAlbumReleaseType", +"MusicComposition", +"MusicEvent", +"MusicGroup", +"MusicPlaylist", +"MusicRecording", +"MusicRelease", +"MusicReleaseFormatType", +"MusicStore", +"MusicVenue", +"MusicVideoObject", +"NGO", +"NLNonprofitType", +"NailSalon", +"NarcoticConsideration", +"Neck", +"Nerve", +"Neuro", +"Neurologic", +"NewCondition", +"NewsArticle", +"NewsMediaOrganization", +"Newspaper", +"NightClub", +"NoninvasiveProcedure", +"Nonprofit501a", +"Nonprofit501c1", +"Nonprofit501c10", +"Nonprofit501c11", +"Nonprofit501c12", +"Nonprofit501c13", +"Nonprofit501c14", +"Nonprofit501c15", +"Nonprofit501c16", +"Nonprofit501c17", +"Nonprofit501c18", +"Nonprofit501c19", +"Nonprofit501c2", +"Nonprofit501c20", +"Nonprofit501c21", +"Nonprofit501c22", +"Nonprofit501c23", +"Nonprofit501c24", +"Nonprofit501c25", +"Nonprofit501c26", +"Nonprofit501c27", +"Nonprofit501c28", +"Nonprofit501c3", +"Nonprofit501c4", +"Nonprofit501c5", +"Nonprofit501c6", +"Nonprofit501c7", +"Nonprofit501c8", +"Nonprofit501c9", +"Nonprofit501d", +"Nonprofit501e", +"Nonprofit501f", +"Nonprofit501k", +"Nonprofit501n", +"Nonprofit501q", +"Nonprofit527", +"NonprofitANBI", +"NonprofitSBBI", +"NonprofitType", +"Nose", +"NotInForce", +"NotYetRecruiting", +"Notary", +"NoteDigitalDocument", +"Number", +"Nursing", +"NutritionInformation", +"OTC", +"Observation", +"Observational", +"Obstetric", +"Occupation", +"OccupationalActivity", +"OccupationalExperienceRequirements", +"OccupationalTherapy", +"OceanBodyOfWater", +"Offer", +"OfferCatalog", +"OfferForLease", +"OfferForPurchase", +"OfferItemCondition", +"OfferShippingDetails", +"OfficeEquipmentStore", +"OfficialLegalValue", +"OfflineEventAttendanceMode", +"OfflinePermanently", +"OfflineTemporarily", +"OnDemandEvent", +"OnSitePickup", +"Oncologic", +"OneTimePayments", +"Online", +"OnlineBusiness", +"OnlineEventAttendanceMode", +"OnlineFull", +"OnlineOnly", +"OnlineStore", +"OpenTrial", +"OpeningHoursSpecification", +"OpinionNewsArticle", +"Optician", +"Optometric", +"Order", +"OrderAction", +"OrderCancelled", +"OrderDelivered", +"OrderInTransit", +"OrderItem", +"OrderPaymentDue", +"OrderPickupAvailable", +"OrderProblem", +"OrderProcessing", +"OrderReturned", +"OrderStatus", +"Organization", +"OrganizationRole", +"OrganizeAction", +"OriginalMediaContent", +"OriginalShippingFees", +"Osteopathic", +"Otolaryngologic", +"OutOfStock", +"OutletStore", +"OverviewHealthAspect", +"OwnershipInfo", +"PET", +"PaidLeave", +"PaintAction", +"Painting", +"PalliativeProcedure", +"Paperback", +"ParcelDelivery", +"ParcelService", +"ParentAudience", +"ParentalSupport", +"Park", +"ParkingFacility", +"ParkingMap", +"PartiallyInForce", +"Pathology", +"PathologyTest", +"Patient", +"PatientExperienceHealthAspect", +"PawnShop", +"PayAction", +"PaymentAutomaticallyApplied", +"PaymentCard", +"PaymentChargeSpecification", +"PaymentComplete", +"PaymentDeclined", +"PaymentDue", +"PaymentMethod", +"PaymentPastDue", +"PaymentService", +"PaymentStatusType", +"Pediatric", +"PeopleAudience", +"PercutaneousProcedure", +"PerformAction", +"PerformanceRole", +"PerformingArtsTheater", +"PerformingGroup", +"Periodical", +"Permit", +"Person", +"PetStore", +"Pharmacy", +"PharmacySpecialty", +"Photograph", +"PhotographAction", +"PhysicalActivity", +"PhysicalActivityCategory", +"PhysicalExam", +"PhysicalTherapy", +"Physician", +"Physiotherapy", +"Place", +"PlaceOfWorship", +"PlaceboControlledTrial", +"PlanAction", +"PlasticSurgery", +"Play", +"PlayAction", +"PlayGameAction", +"Playground", +"Plumber", +"PodcastEpisode", +"PodcastSeason", +"PodcastSeries", +"Podiatric", +"PoliceStation", +"PoliticalParty", +"Pond", +"PostOffice", +"PostalAddress", +"PostalCodeRangeSpecification", +"Poster", +"PotentialActionStatus", +"PreOrder", +"PreOrderAction", +"PreSale", +"PregnancyHealthAspect", +"PrependAction", +"Preschool", +"PrescriptionOnly", +"PresentationDigitalDocument", +"PreventionHealthAspect", +"PreventionIndication", +"PriceComponentTypeEnumeration", +"PriceSpecification", +"PriceTypeEnumeration", +"PrimaryCare", +"Prion", +"Product", +"ProductCollection", +"ProductGroup", +"ProductModel", +"ProfessionalService", +"ProfilePage", +"PrognosisHealthAspect", +"ProgramMembership", +"Project", +"PronounceableText", +"Property", +"PropertyValue", +"PropertyValueSpecification", +"Protein", +"Protozoa", +"Psychiatric", +"PsychologicalTreatment", +"PublicHealth", +"PublicHolidays", +"PublicSwimmingPool", +"PublicToilet", +"PublicationEvent", +"PublicationIssue", +"PublicationVolume", +"Pulmonary", +"QAPage", +"QualitativeValue", +"QuantitativeValue", +"QuantitativeValueDistribution", +"Quantity", +"Question", +"Quiz", +"Quotation", +"QuoteAction", +"RVPark", +"RadiationTherapy", +"RadioBroadcastService", +"RadioChannel", +"RadioClip", +"RadioEpisode", +"RadioSeason", +"RadioSeries", +"RadioStation", +"Radiography", +"RandomizedTrial", +"Rating", +"ReactAction", +"ReadAction", +"ReadPermission", +"RealEstateAgent", +"RealEstateListing", +"RearWheelDriveConfiguration", +"ReceiveAction", +"Recipe", +"Recommendation", +"RecommendedDoseSchedule", +"Recruiting", +"RecyclingCenter", +"ReducedRelevanceForChildrenConsideration", +"RefundTypeEnumeration", +"RefurbishedCondition", +"RegisterAction", +"Registry", +"ReimbursementCap", +"RejectAction", +"RelatedTopicsHealthAspect", +"RemixAlbum", +"Renal", +"RentAction", +"RentalCarReservation", +"RentalVehicleUsage", +"RepaymentSpecification", +"ReplaceAction", +"ReplyAction", +"Report", +"ReportageNewsArticle", +"ReportedDoseSchedule", +"ResearchOrganization", +"ResearchProject", +"Researcher", +"Reservation", +"ReservationCancelled", +"ReservationConfirmed", +"ReservationHold", +"ReservationPackage", +"ReservationPending", +"ReservationStatusType", +"ReserveAction", +"Reservoir", +"Residence", +"Resort", +"RespiratoryTherapy", +"Restaurant", +"RestockingFees", +"RestrictedDiet", +"ResultsAvailable", +"ResultsNotAvailable", +"ResumeAction", +"Retail", +"ReturnAction", +"ReturnAtKiosk", +"ReturnByMail", +"ReturnFeesCustomerResponsibility", +"ReturnFeesEnumeration", +"ReturnInStore", +"ReturnLabelCustomerResponsibility", +"ReturnLabelDownloadAndPrint", +"ReturnLabelInBox", +"ReturnLabelSourceEnumeration", +"ReturnMethodEnumeration", +"ReturnShippingFees", +"Review", +"ReviewAction", +"ReviewNewsArticle", +"Rheumatologic", +"RightHandDriving", +"RisksOrComplicationsHealthAspect", +"RiverBodyOfWater", +"Role", +"RoofingContractor", +"Room", +"RsvpAction", +"RsvpResponseMaybe", +"RsvpResponseNo", +"RsvpResponseType", +"RsvpResponseYes", +"SRP", +"SafetyHealthAspect", +"SaleEvent", +"SalePrice", +"SatireOrParodyContent", +"SatiricalArticle", +"Saturday", +"Schedule", +"ScheduleAction", +"ScholarlyArticle", +"School", +"SchoolDistrict", +"ScreeningEvent", +"ScreeningHealthAspect", +"Sculpture", +"SeaBodyOfWater", +"SearchAction", +"SearchRescueOrganization", +"SearchResultsPage", +"Season", +"Seat", +"SeatingMap", +"SeeDoctorHealthAspect", +"SeekToAction", +"SelfCareHealthAspect", +"SelfStorage", +"SellAction", +"SendAction", +"Series", +"Service", +"ServiceChannel", +"SexualContentConsideration", +"ShareAction", +"SheetMusic", +"ShippingDeliveryTime", +"ShippingRateSettings", +"ShoeStore", +"ShoppingCenter", +"ShortStory", +"SideEffectsHealthAspect", +"SingleBlindedTrial", +"SingleCenterTrial", +"SingleFamilyResidence", +"SinglePlayer", +"SingleRelease", +"SiteNavigationElement", +"SizeGroupEnumeration", +"SizeSpecification", +"SizeSystemEnumeration", +"SizeSystemImperial", +"SizeSystemMetric", +"SkiResort", +"Skin", +"SocialEvent", +"SocialMediaPosting", +"SoftwareApplication", +"SoftwareSourceCode", +"SoldOut", +"SolveMathAction", +"SomeProducts", +"SoundtrackAlbum", +"SpeakableSpecification", +"SpecialAnnouncement", +"Specialty", +"SpeechPathology", +"SpokenWordAlbum", +"SportingGoodsStore", +"SportsActivityLocation", +"SportsClub", +"SportsEvent", +"SportsOrganization", +"SportsTeam", +"SpreadsheetDigitalDocument", +"StadiumOrArena", +"StagedContent", +"StagesHealthAspect", +"State", +"Statement", +"StatisticalPopulation", +"StatisticalVariable", +"StatusEnumeration", +"SteeringPositionValue", +"Store", +"StoreCreditRefund", +"StrengthTraining", +"StructuredValue", +"StudioAlbum", +"SubscribeAction", +"Subscription", +"Substance", +"SubwayStation", +"Suite", +"Sunday", +"SuperficialAnatomy", +"Surgical", +"SurgicalProcedure", +"SuspendAction", +"Suspended", +"Syllabus", +"SymptomsHealthAspect", +"Synagogue", +"TVClip", +"TVEpisode", +"TVSeason", +"TVSeries", +"Table", +"TakeAction", +"TattooParlor", +"Taxi", +"TaxiReservation", +"TaxiService", +"TaxiStand", +"TaxiVehicleUsage", +"Taxon", +"TechArticle", +"TelevisionChannel", +"TelevisionStation", +"TennisComplex", +"Terminated", +"Text", +"TextDigitalDocument", +"TextObject", +"TheaterEvent", +"TheaterGroup", +"Therapeutic", +"TherapeuticProcedure", +"Thesis", +"Thing", +"Throat", +"Thursday", +"Ticket", +"TieAction", +"Time", +"TipAction", +"TireShop", +"TobaccoNicotineConsideration", +"TollFree", +"TouristAttraction", +"TouristDestination", +"TouristInformationCenter", +"TouristTrip", +"Toxicologic", +"ToyStore", +"TrackAction", +"TradeAction", +"TraditionalChinese", +"TrainReservation", +"TrainStation", +"TrainTrip", +"TransferAction", +"TransformedContent", +"TransitMap", +"TravelAction", +"TravelAgency", +"TreatmentIndication", +"TreatmentsHealthAspect", +"Trip", +"TripleBlindedTrial", +"True", +"Tuesday", +"TypeAndQuantityNode", +"TypesHealthAspect", +"UKNonprofitType", +"UKTrust", +"URL", +"USNonprofitType", +"Ultrasound", +"UnRegisterAction", +"UnclassifiedAdultConsideration", +"UnemploymentSupport", +"UnincorporatedAssociationCharity", +"UnitPriceSpecification", +"UnofficialLegalValue", +"UpdateAction", +"Urologic", +"UsageOrScheduleHealthAspect", +"UseAction", +"UsedCondition", +"UserBlocks", +"UserCheckins", +"UserComments", +"UserDownloads", +"UserInteraction", +"UserLikes", +"UserPageVisits", +"UserPlays", +"UserPlusOnes", +"UserReview", +"UserTweets", +"VacationRental", +"VeganDiet", +"VegetarianDiet", +"Vehicle", +"Vein", +"VenueMap", +"Vessel", +"VeterinaryCare", +"VideoGallery", +"VideoGame", +"VideoGameClip", +"VideoGameSeries", +"VideoObject", +"VideoObjectSnapshot", +"ViewAction", +"VinylFormat", +"ViolenceConsideration", +"VirtualLocation", +"Virus", +"VisualArtsEvent", +"VisualArtwork", +"VitalSign", +"Volcano", +"VoteAction", +"WPAdBlock", +"WPFooter", +"WPHeader", +"WPSideBar", +"WantAction", +"WarrantyPromise", +"WarrantyScope", +"WatchAction", +"Waterfall", +"WeaponConsideration", +"WearAction", +"WearableMeasurementBack", +"WearableMeasurementChestOrBust", +"WearableMeasurementCollar", +"WearableMeasurementCup", +"WearableMeasurementHeight", +"WearableMeasurementHips", +"WearableMeasurementInseam", +"WearableMeasurementLength", +"WearableMeasurementOutsideLeg", +"WearableMeasurementSleeve", +"WearableMeasurementTypeEnumeration", +"WearableMeasurementWaist", +"WearableMeasurementWidth", +"WearableSizeGroupBig", +"WearableSizeGroupBoys", +"WearableSizeGroupEnumeration", +"WearableSizeGroupExtraShort", +"WearableSizeGroupExtraTall", +"WearableSizeGroupGirls", +"WearableSizeGroupHusky", +"WearableSizeGroupInfants", +"WearableSizeGroupJuniors", +"WearableSizeGroupMaternity", +"WearableSizeGroupMens", +"WearableSizeGroupMisses", +"WearableSizeGroupPetite", +"WearableSizeGroupPlus", +"WearableSizeGroupRegular", +"WearableSizeGroupShort", +"WearableSizeGroupTall", +"WearableSizeGroupWomens", +"WearableSizeSystemAU", +"WearableSizeSystemBR", +"WearableSizeSystemCN", +"WearableSizeSystemContinental", +"WearableSizeSystemDE", +"WearableSizeSystemEN13402", +"WearableSizeSystemEnumeration", +"WearableSizeSystemEurope", +"WearableSizeSystemFR", +"WearableSizeSystemGS1", +"WearableSizeSystemIT", +"WearableSizeSystemJP", +"WearableSizeSystemMX", +"WearableSizeSystemUK", +"WearableSizeSystemUS", +"WebAPI", +"WebApplication", +"WebContent", +"WebPage", +"WebPageElement", +"WebSite", +"Wednesday", +"WesternConventional", +"Wholesale", +"WholesaleStore", +"WinAction", +"Winery", +"Withdrawn", +"WorkBasedProgram", +"WorkersUnion", +"WriteAction", +"WritePermission", +"XPathType", +"XRay", +"ZoneBoardingPolicy", +"Zoo" +] diff --git a/data/tv/log.json b/data/tv/log.json index 4443e43..f846ca9 100644 --- a/data/tv/log.json +++ b/data/tv/log.json @@ -1,4 +1,10 @@ [ + { + "Series Title": "The Sandbaggers", + "Episode Title": "First Principles", + "Episode Number": "S01E01", + "Date Watched": "2023-10-05" + }, { "Series Title": "Once Upon a Time in Northern Ireland", "Episode Title": "Who Wants to Live Like That?", diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 0d31da7..6dc1592 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -12,7 +12,7 @@

{{ .Title | safeHTML }} {{ range .AlternativeOutputFormats -}} - + {{ end }}

diff --git a/layouts/_default/section.html b/layouts/_default/section.html index 1286d5c..514b35b 100644 --- a/layouts/_default/section.html +++ b/layouts/_default/section.html @@ -10,7 +10,7 @@ {{ define "main-header" }}
{{ $section := first 1 ( split .File.Dir "/" ) }} - {{ if ( in "books" ( delimit $section "" ) ) }} + {{ if ( or ( in "books" ( delimit $section "" ) ) ( in "games" ( delimit $section "" ) ) ) }} Current ~ {{ end }} Log ~ @@ -19,7 +19,7 @@

{{ .Title | safeHTML }} {{ range .AlternativeOutputFormats -}} - + {{ end }}

diff --git a/layouts/partials/books/publication-year.html b/layouts/partials/books/publication-year.html new file mode 100644 index 0000000..738d965 --- /dev/null +++ b/layouts/partials/books/publication-year.html @@ -0,0 +1,7 @@ +

{{- index . "Year Published" -}} +{{- if ( index . "Original Publication Year" ) -}} + {{- if ( ne ( index . "Original Publication Year" ) ( index . "Year Published" ) ) -}} +  (orig. {{ index . "Original Publication Year" }}) + {{- end -}} +{{- end -}} +

diff --git a/layouts/partials/books/table-body.html b/layouts/partials/books/table-body.html index 0f66e2a..1fa4cd2 100644 --- a/layouts/partials/books/table-body.html +++ b/layouts/partials/books/table-body.html @@ -3,17 +3,7 @@ {{ if index . "Date Added" }}{{ time.Format "Jan 2, 2006" ( index . "Date Added" ) }}{{ else }}n/a{{end }} -

- {{- with ( where ( where $.Site.Pages "Section" "books" ) "Title" .Title ) -}} - {{ range . }} - - {{ end }} - {{- end -}} - {{ .Title }}{{ if .Edition }} ({{ .Edition }}){{ end }} - {{- with ( where ( where $.Site.Pages "Section" "books" ) "Title" .Title ) -}} - - {{- end -}} -

+ {{- partial "cite" ( dict "c" . "schemaType" "Book" ) -}}

{{ .Author }}

@@ -22,19 +12,14 @@ {{- end -}} -

{{- index . "Year Published" -}} - {{- if ( index . "Original Publication Year" ) -}} - {{- if ( ne ( index . "Original Publication Year" ) ( index . "Year Published" ) ) -}} -  (orig. {{ index . "Original Publication Year" }}) - {{- end -}} - {{- end -}} + {{- partial "books/publication-year.html" . -}} {{- if index . "Date Started" -}} {{- time.Format "Jan 2, 2006" ( index . "Date Started" ) -}} {{- end -}}– - + {{ end }} {{ else if ( eq ( .Scratch.Get "listMode" ) "log" ) }} @@ -63,12 +48,7 @@ {{- end -}} -

{{- index . "Year Published" -}} - {{- if ( index . "Original Publication Year" ) -}} - {{- if ( ne ( index . "Original Publication Year" ) ( index . "Year Published" ) ) -}} -  (orig. {{ index . "Original Publication Year" }}) - {{- end -}} - {{- end -}} + {{- partial "books/publication-year.html" . -}} {{- if index . "Date Started" -}} @@ -81,7 +61,7 @@ Unknown {{- end -}} - + {{ end }}

Assorted

@@ -109,12 +89,7 @@ {{- end -}} -

{{- index . "Year Published" -}} - {{- if ( index . "Original Publication Year" ) -}} - {{- if ( ne ( index . "Original Publication Year" ) ( index . "Year Published" ) ) -}} -  (orig. {{ index . "Original Publication Year" }}) - {{- end -}} - {{- end -}} + {{- partial "books/publication-year.html" . -}} {{- if index . "Date Started" -}} @@ -127,7 +102,7 @@ Unknown {{- end -}} - + {{ end }} {{ else if ( eq ( .Scratch.Get "listMode" ) "wishlist" ) }} {{ range ( sort $.Site.Data.books.wishlist "Title" "asc" ) }} @@ -153,14 +128,9 @@ {{- end -}} -

{{- index . "Year Published" -}} - {{- if ( index . "Original Publication Year" ) -}} - {{- if ( ne ( index . "Original Publication Year" ) ( index . "Year Published" ) ) -}} -  (orig. {{ index . "Original Publication Year" }}) - {{- end -}} - {{- end -}} + {{- partial "books/publication-year.html" . -}} n/a - + {{ end }} {{ end }} diff --git a/layouts/partials/cite.html b/layouts/partials/cite.html new file mode 100644 index 0000000..37563e0 --- /dev/null +++ b/layouts/partials/cite.html @@ -0,0 +1,16 @@ +{{- $itemType := default "CreativeWork" .schemaType -}} + +{{- with .c -}} + + {{- default .Title $.title -}} + +{{- if .Edition }} ({{ .Edition }}){{- end -}} +{{- end -}} diff --git a/layouts/partials/films/table-body.html b/layouts/partials/films/table-body.html index b53f9f8..f36fb08 100644 --- a/layouts/partials/films/table-body.html +++ b/layouts/partials/films/table-body.html @@ -6,15 +6,7 @@ {{ time.Format "Jan 2, 2006" ( index . "Date Added" ) }} - {{- with ( where ( where $.Site.Pages "Section" "films" ) "Title" .Title ) -}} - {{ range . }} - - {{ end }} - {{- end -}} - {{ .Title }} - {{- with ( where ( where $.Site.Pages "Section" "films" ) "Title" .Title ) -}} - - {{- end -}} + {{- partial "cite" ( dict "c" . "schemaType" "Movie" ) -}} {{ index . "Release Year" }} diff --git a/layouts/partials/games/table-body.html b/layouts/partials/games/table-body.html index 296688d..821d0b8 100644 --- a/layouts/partials/games/table-body.html +++ b/layouts/partials/games/table-body.html @@ -1,40 +1,78 @@ {{ if ( eq ( .Scratch.Get "listMode" ) "current" ) }} - {{ .Scratch.Set "filterCol" "Title" }} - {{ .Scratch.Set "filterDir" "asc" }} + {{ range ( sort $.Site.Data.games.current "Date Started" "desc" ) }} + + + {{- partial "cite" ( dict "c" . "schemaType" "VideoGame" ) -}} + + {{ index . "Date Released" }} + {{ .Platforms }} + + {{- if index . "Date Started" -}} + {{- time.Format "Jan 2, 2006" ( index . "Date Started" ) -}} + {{- else -}} + Unknown + {{- end -}}–Unknown + + + {{ end }} {{ else if ( eq ( .Scratch.Get "listMode" ) "log" ) }} - {{ .Scratch.Set "filterCol" "Title" }} - {{ .Scratch.Set "filterDir" "asc" }} + +

Diary

+ + {{ range ( sort ( where $.Site.Data.games.log "Date Finished" "!=" "" ) "Date Finished" "desc" ) }} + + + {{- partial "cite" ( dict "c" . "schemaType" "VideoGame" ) -}} + + {{ index . "Date Released" }} + {{ .Platforms }} + + {{- if index . "Date Started" -}} + {{- time.Format "Jan 2, 2006" ( index . "Date Started" ) -}} + {{- else -}} + Unknown + {{- end -}}–{{- if index . "Date Finished" -}} + {{- time.Format "Jan 2, 2006" ( index . "Date Finished" ) -}} + {{- else -}} + Unknown + {{- end -}} + {{- if index . "Level of Completion" }} ({{ index . "Level of Completion" }}){{- end -}} + + + {{ end }} + +

Assorted

+ + {{ range ( sort ( where $.Site.Data.games.log "Date Finished" "" ) "Title" "asc" ) }} + + + {{- partial "cite" ( dict "c" . "schemaType" "VideoGame" ) -}} + + {{ index . "Date Released" }} + {{ .Platforms }} + + {{- if index . "Date Started" -}} + {{- time.Format "Jan 2, 2006" ( index . "Date Started" ) -}} + {{- else -}} + Unknown + {{- end -}}–{{- if index . "Date Finished" -}} + {{- time.Format "Jan 2, 2006" ( index . "Date Finished" ) -}} + {{- else -}} + Unknown + {{- end -}} + {{- if index . "Level of Completion" }} ({{ index . "Level of Completion" }}){{- end -}} + + + {{ end }} {{ else if ( eq ( .Scratch.Get "listMode" ) "wishlist" ) }} - {{ .Scratch.Set "filterCol" "Title" }} - {{ .Scratch.Set "filterDir" "asc" }} -{{ end }} - -{{ range ( sort ( index $.Site.Data.games ( .Scratch.Get "listMode" ) ) ( .Scratch.Get "filterCol" ) ( .Scratch.Get "filterDir" ) ) }} - - - {{- with ( where ( where $.Site.Pages "Section" "games" ) "Title" .Title ) -}} - {{ range . }} - - {{ end }} - {{- end -}} - {{ .Title }} - {{- with ( where ( where $.Site.Pages "Section" "games" ) "Title" .Title ) -}} - - {{- end -}} - - {{ index . "Date Released" }} - {{ .Platforms }} - - {{- if index . "Date Started" -}} - {{- time.Format "Jan 2, 2006" ( index . "Date Started" ) -}} - {{- else -}} - Unknown - {{- end -}}–{{- if index . "Date Finished" -}} - {{- time.Format "Jan 2, 2006" ( index . "Date Finished" ) -}} - {{- else -}} - Unknown - {{- end -}} - {{- if index . "Level of Completion" }} ({{ index . "Level of Completion" }}){{- end -}} - - + {{ range ( sort $.Site.Data.games.wishlist "Title" "asc" ) }} + + + {{- partial "cite" ( dict "c" . "schemaType" "VideoGame" ) -}} + + {{ index . "Date Released" }} + {{ .Platforms }} + n/a + + {{ end }} {{ end }} diff --git a/layouts/partials/header/site-header.html b/layouts/partials/header/site-header.html index 068f7af..d164b07 100644 --- a/layouts/partials/header/site-header.html +++ b/layouts/partials/header/site-header.html @@ -6,7 +6,7 @@ 📧 ~ 💻 ~ 🔐 ~ - ~ + ~