@ndla/ui 30.7.1 → 30.8.1

package/src/Figure/Figure.tsx

@@ -6,13 +6,12 @@
  *
  */
 
-// N.B These component is used to render static markup serverside
+// N.B These components is used to render static markup serverside
 // Any interactivty is added by scripts located in the ndla-article-scripts package
 
 import React, { ReactNode } from 'react';
 import BEMHelper from 'react-bem-helper';
 import { isFunction as isFunctionHelper, parseMarkdown } from '@ndla/util';
-import { useTranslation } from 'react-i18next';
 import { Link as LinkIcon } from '@ndla/icons/common';
 import { LicenseByline } from '@ndla/licenses';
 import SafeLink from '@ndla/safelink';
@@ -36,9 +35,8 @@ export const FigureCaption = ({
   hideFigcaption,
   hasLinkedVideo,
   hideIconsAndAuthors,
+  linkedVideoMessages,
 }: FigureCaptionProps) => {
-  const { t } = useTranslation();
-
   return (
     <figcaption {...classes('caption', hideFigcaption && !isMobile ? 'hidden-caption' : undefined)}>
       {caption ? <div {...classes('info')}>{parseMarkdown(caption)}</div> : null}
@@ -66,8 +64,8 @@ export const FigureCaption = ({
                     size="small"
                     type="button"
                     {...classes('toggleAlternativeVideo')}>
-                    <span className="original">{t('figure.button.alternative')}</span>
-                    <span className="alternative hidden">{t('figure.button.original')}</span>
+                    <span className="original">{linkedVideoMessages?.alternative}</span>
+                    <span className="alternative hidden">{linkedVideoMessages?.original}</span>
                   </Button>
                 )}
               </div>
@@ -122,6 +120,10 @@ interface FigureCaptionProps {
   hideFigcaption?: boolean;
   hasLinkedVideo?: boolean;
   hideIconsAndAuthors?: boolean;
+  linkedVideoMessages?: {
+    original: string;
+    alternative: string;
+  };
 }
 
 const Figure = ({ children, type = 'full', resizeIframe, ...rest }: Props) => {

package/src/MyNdla/Resource/Folder.tsx

@@ -99,15 +99,18 @@ const FolderTitle = styled.h2`
   }
 `;
 
-const MenuWrapper = styled.div`
+interface MenuWrapperProps {
+  hasMenuButton: boolean;
+}
+
+const MenuWrapper = styled.div<MenuWrapperProps>`
   overflow: hidden;
   display: flex;
   flex-direction: row;
   align-items: center;
   gap: ${spacing.xsmall};
   justify-content: space-between;
-  margin: -${spacing.nsmall};
-  margin-left: 0;
+  margin: -${spacing.nsmall} -${(props) => (props.hasMenuButton ? spacing.nsmall : 0)} -${spacing.nsmall} 0;
 `;
 
 const CountContainer = styled.div`
@@ -185,7 +188,7 @@ const Folder = ({ id, link, title, subFolders, subResources, type = 'list', menu
           <FolderTitle title={title}>{title}</FolderTitle>
         </StyledLink>
       </TitleWrapper>
-      <MenuWrapper>
+      <MenuWrapper hasMenuButton={!!menuItems?.length}>
         <CountContainer>
           <Count layoutType={type} type={'folder'} count={subFolders} />
           <Count layoutType={type} type={'resource'} count={subResources} />

package/src/Resource/resourceComponents.tsx

@@ -55,6 +55,7 @@ const StyledTagListElement = styled.li`
 
 const StyledSafeLink = styled(SafeLink)`
   display: flex;
+  justify-content: flex-end;
   align-items: center;
   box-shadow: none;
   color: ${colors.brand.grey};

package/src/locale/messages-en.ts

@@ -1093,6 +1093,7 @@ const messages = {
     alreadyFavourited: 'Already in my favourites',
     alreadyInFolder: 'Already in folder. You can still save new tags.',
     noFolderSelected: 'Select or create a new folder to save the resource.',
+    examLockInfo: 'Editing content on Min NDLA is deactivated for pupils during the exam period.',
     help: 'Help',
     more: 'More options',
     listView: 'List view',

package/src/locale/messages-nb.ts

@@ -1091,6 +1091,7 @@ const messages = {
     alreadyFavourited: 'Allerede lagt til i mine favoritter',
     alreadyInFolder: 'Finnes allerede i mappen. Du kan fortsatt lagre nye emneknagger.',
     noFolderSelected: 'Velg eller opprett ny mappe for å lagre ressursen',
+    examLockInfo: 'Redigering av innhold på Min NDLA er deaktivert for elever i eksamensperioden.',
     help: 'Hjelp',
     more: 'Flere valg',
     listView: 'Listevisning',

package/src/locale/messages-nn.ts

@@ -1092,6 +1092,7 @@ const messages = {
     alreadyFavourited: 'Allereie lagt til i mine favorittar',
     alreadyInFolder: 'Finst allereie i mappa. Du kan fortsatt lagre nye emneknaggar.',
     noFolderSelected: 'Velg eller opprett ny mappe for å lagre ressursen',
+    examLockInfo: 'Redigering av innhald på Min NDLA er deaktivert for elevar i eksamensperioden.',
     help: 'Hjelp',
     more: 'Fleire val',
     listView: 'Listevisning',

package/src/locale/messages-se.ts

@@ -1092,6 +1092,7 @@ const messages = {
     alreadyFavourited: 'Lea juo biddjon oiddohin',
     alreadyInFolder: 'Gávdno juo máhpas. Sáhtát ain vurket ođđa fáddágilkoriid.',
     noFolderSelected: 'Vállje dahje ráhkat ođđa máhpa vai seasttát resurssa',
+    examLockInfo: 'Mu NDLA redigeren ii leat doaimmas ohppiide eksámenáigodagas.',
     help: 'Veahkki',
     more: 'Eanet válljejumit',
     listView: 'Oppalašlistu',

package/src/locale/messages-sma.ts

@@ -1093,6 +1093,7 @@ const messages = {
     alreadyFavourited: 'Allerede lagt til i mine favoritter',
     alreadyInFolder: 'Finnes allerede i mappen. Du kan fortsatt lagre nye emneknagger.',
     noFolderSelected: 'Velg eller opprett ny mappe for å lagre ressursen',
+    examLockInfo: 'Redigering av innhold på Min NDLA er deaktivert for elever i eksamensperioden.',
     help: 'Hjelp',
     more: 'Flere valg',
     listView: 'Listevisning',