Version bump to 2.0.6 and iframe macro has been added

2017-12-03 14:13:51 +01:00
parent 370aeeedf7
commit 86693513d7
23 changed files with 171 additions and 70 deletions
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,12 +1,13 @@
 Changelog
 =========

-2.0.6-dev - no version bump / unreleased
-+++++++++
+2.0.6
+++++

 - add rake tasks: drop_settings, setting_get and setting_set
 - Updated nvd3 library to 1.8.6
 - Updated angularjs libraries to v2.0.0-rc.1
+- Wiki iframe macro integration has been added

 2.0.5
 +++++
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -41,6 +41,7 @@ de:
  global_wiki_footer_info: 'Hier kann ein projektübergreifender Wiki Footer hinterlegt werden. Wird über "Wiki Extensions" ein projektspezifischer Footer angelegt, wird dieser anstelle des projektübergreifenden Footers verwendet.'
  global_wiki_header_info: 'Hier kann ein projektübergreifender Wiki Header hinterlegt werden. Wird über "Wiki Extensions" ein projektspezifischer Header angelegt, wird dieser immer vorzugsweise vor dem projektübergreifenden Header verwendet.'
  global_wiki_sidebar_info: 'Hier kann für die Wiki Sidebar ein projektübergreifender Text hinterlegt werden. Diese Sidebar wird nur auf den Wiki Seiten angezeigt und kann z.B. für  Makros wie "Zuletzt geänderte Seiten" verwendet werden. Wird eine projektspezifische Sidebar angelegt (über eine Wiki Seite), dann wird diese anstelle der projektübergreifenden Sidebar angezeigt.'
+  google_maps_embed_api_html: Wenn Du das Gmap Makro verwenden willst um Google Karten darzustellen, musst Du hier Deinen Google Maps Embed API Schlüssel eintragen. Mehr Informationen dazu findest Du unter <a href="https://developers.google.com/maps/documentation/embed/guide" target="_blank">https://developers.google.com/maps/documentation/embed/guide</a>. Wird hier kein Schlüssel eingetragen, kann das gmap Makro nicht verwendet werden.
  invisible_captcha_info_html: Ist diese Option aktiviert, wird mit Hilfe von <a href="https://github.com/markets/invisible_captcha" target="_blank">invisible_captcha</a> ein SPAM Schutz auf die Registrierungs-Seite für neue Benutzer eingesetzt. Diese steht nur zur Verfügung, wenn Redmine die Registrierung neuer Benutzer zulässt.
  label_account_login: "Text für Anmeldeseite"
  label_add_go_to_top: '"Nach oben" Link hinzufügen'
@@ -61,6 +62,7 @@ de:
  label_global_wiki_header: "Projektübergreifender Wiki Header"
  label_global_wiki_sidebar: "Projektübergreifender Wiki-Sidebar Inhalt"
  label_go_to_top: "Nach oben"
+  label_google_maps_embed_api: Google Maps Embed API Key
  label_hour: Stunde
  label_icon_color: Symbolfarbe
  label_invisible_captcha: SPAM Schutz bei Registrierung
@@ -71,6 +73,7 @@ de:
  label_menu_entry: "Menüpunkt"
  label_monthly: monatlich
  label_new_ticket_message: "Hinweistext für neue Tickets"
+  label_open_in_new_windows: In neuen Fenster öffnen
  label_optional: "optional"
  label_overview_bottom: "Übersichtsseite, unten"
  label_overview_page: "Übersichtsseite"
@@ -106,6 +109,7 @@ de:
  label_twitter_hashtag: Twitter Hashtag
  label_uptime: Betriebszeit
  label_user_list: "Benutzerliste"
+  label_web_apis: Web APIs
  label_weekly: wöchentlich
  label_wiki_pdf_header: Wiki PDF Kopfzeile
  label_wiki_pdf_remove_attachments: Dateianhänge nicht anzeigen
@@ -142,6 +146,3 @@ de:
  wiki_pdf_header_info: Dieser Textblock wir auf der ersten Seite vor dem eigentlichen Inhalt der Wiki Seite in der PDF Ansicht angezeigt. Die Makros sind hier nur eingeschränkt einsetzbar.
  wiki_pdf_remove_attachments_info: Wenn aktiv, werden die an der Wiki Seite angehängten Dateien nicht in der PDF Ansicht angezeigt.
  wiki_pdf_remove_title_info: Wenn aktiv, wird der Wiki Titel nicht in der PDF Ansicht angezeigt.
-  label_web_apis: Web APIs
-  label_google_maps_embed_api: Google Maps Embed API Key
-  google_maps_embed_api_html: Wenn Du das Gmap Makro verwenden willst um Google Karten darzustellen, musst Du hier Deinen Google Maps Embed API Schlüssel eintragen. Mehr Informationen dazu findest Du unter <a href="https://developers.google.com/maps/documentation/embed/guide" target="_blank">https://developers.google.com/maps/documentation/embed/guide</a>. Wird hier kein Schlüssel eingetragen, kann das gmap Makro nicht verwendet werden.
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -41,6 +41,7 @@ en:
  global_wiki_footer_info: 'Enter a project wide wiki footer here. In case a project specific wiki footer is used by "Wiki Extensions", this will be preferably displayed instead.'
  global_wiki_header_info: 'Enter a project wide wiki header here. In case a project specific wiki header is used by "Wiki Extensions", this will be preferably displayed instead.'
  global_wiki_sidebar_info: 'Enter a project wide available text message for your wiki sidebar, here. This sidebar text will be displayed at the wiki pages only. Use this space for Macros like "Last changed pages" for example. In case a project specific sidebar is used (wiki page), this will be preferably displayed in the sidebar instead.'
+  google_maps_embed_api_html: In case you want to use the Gmap macro in order to display Goole maps please implement your Google Maps API key here. Afterwards you can use the macro and various paramters. More information on how to use the paramaters are provided at <a href="https://developers.google.com/maps/documentation/embed/guide" target="_blank">https://developers.google.com/maps/documentation/embed/guide</a>. The Gmap macro works only in combination with the embedded key here.
  invisible_captcha_info_html: In case this option is activated an <a href="https://github.com/markets/invisible_captcha" target="_blank">invisible_captcha</a> SPAM protection is activated for the registration page of new users. This function is only available, if you enabled self-registration, too.
  label_account_login: "Text for login page"
  label_add_go_to_top: 'Add "Go to top" link'
@@ -61,6 +62,7 @@ en:
  label_global_wiki_header: "Project wide wiki header"
  label_global_wiki_sidebar: "Global wiki sidebar"
  label_go_to_top: "Go to top"
+  label_google_maps_embed_api: Google Maps Embed API Key
  label_hour: hour
  label_icon_color: Icon color
  label_invisible_captcha: SPAM protection for registration
@@ -71,6 +73,7 @@ en:
  label_menu_entry: "Menu item"
  label_monthly: monthly
  label_new_ticket_message: "Note for new issues"
+  label_open_in_new_windows: Open in new windows
  label_optional: "optional"
  label_overview_bottom: "Overview page, bottom"
  label_overview_page: "Overview page"
@@ -106,6 +109,7 @@ en:
  label_twitter_hashtag: Twitter hashtag
  label_uptime: Uptime
  label_user_list: "User list"
+  label_web_apis: Web APIs
  label_weekly: weekly
  label_wiki_pdf_header: Wiki PDF header
  label_wiki_pdf_remove_attachments: Remove attachments from PDF view
@@ -142,6 +146,3 @@ en:
  wiki_pdf_header_info: This text block will be displayed on the first page before the regular Wiki content in the PDF view. Macro use is very restricted, here.
  wiki_pdf_remove_attachments_info: When active the attached Wiki files will not be displayed in PDF view.
  wiki_pdf_remove_title_info: When active the Wiki title info will not be displayed in PDF view.
-  label_web_apis: Web APIs
-  label_google_maps_embed_api: Google Maps Embed API Key
-  google_maps_embed_api_html: In case you want to use the Gmap macro in order to display Goole maps please implement your Google Maps API key here. Afterwards you can use the macro and various paramters. More information on how to use the paramaters are provided at <a href="https://developers.google.com/maps/documentation/embed/guide" target="_blank">https://developers.google.com/maps/documentation/embed/guide</a>. The Gmap macro works only in combination with the embedded key here.
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -41,6 +41,7 @@ fr:
  global_wiki_footer_info: 'Enter a project wide wiki footer here. In case a project specific wiki footer is used by "Wiki Extensions", this will be preferably displayed instead.'
  global_wiki_header_info: 'Enter a project wide wiki header here. In case a project specific wiki header is used by "Wiki Extensions", this will be preferably displayed instead.'
  global_wiki_sidebar_info: 'Enter a project wide available text message for your wiki sidebar, here. This sidebar text will be displayed at the wiki pages only. Use this space for Macros like "Last changed pages" for example. In case a project specific sidebar is used (wiki page), this will be preferably displayed in the sidebar instead.'
+  google_maps_embed_api_html: Si vous souhaitez utiliser la macro Gmap pour afficher les cartes de Goole, veuillez implémenter votre clé API Google Maps ici. Ensuite, vous pouvez utiliser la macro et divers paramètres. Pour plus d'informations sur l'utilisation des paramètres, voir <a href="https://developers.google.com/maps/documentation/embed/guide">https://developers.google.com/maps/documentation/embed/guide</a>. La macro Gmap ne fonctionne qu'en combinaison avec la clé intégrée.
  invisible_captcha_info_html: In case this option is activated an <a href="https://github.com/markets/invisible_captcha" target="_blank">invisible_captcha</a> SPAM protection is activated for the registration page of new users. This function is only available, if you enabled self-registration, too.
  label_account_login: "Texte pour la page de login"
  label_add_go_to_top: 'Add "Go to top" link'
@@ -61,6 +62,7 @@ fr:
  label_global_wiki_header: "Project wide wiki header"
  label_global_wiki_sidebar: "Global wiki sidebar"
  label_go_to_top: "Go to top"
+  label_google_maps_embed_api: Google Maps Embed API Key
  label_hour: Heure
  label_icon_color: Icon color
  label_invisible_captcha: SPAM protection for registration
@@ -71,6 +73,7 @@ fr:
  label_menu_entry: "Menu item"
  label_monthly: mensuel
  label_new_ticket_message: "Note for new issues"
+  label_open_in_new_windows: Open in new windows
  label_optional: "optional"
  label_overview_bottom: "Page de sommaire, fond"
  label_overview_page: "Page de sommaire"
@@ -106,6 +109,7 @@ fr:
  label_twitter_hashtag: Twitter hashtag
  label_uptime: Uptime
  label_user_list: "User list"
+  label_web_apis: Web APIs
  label_weekly: hebdomadaire
  label_wiki_pdf_header: Wiki PDF header
  label_wiki_pdf_remove_attachments: Remove attachments from PDF view
@@ -142,6 +146,3 @@ fr:
  wiki_pdf_header_info: This text block will be displayed on the first page before the regular Wiki content in the PDF view. Macro use is very restricted, here.
  wiki_pdf_remove_attachments_info: When active the attached Wiki files will not be displayed in PDF view.
  wiki_pdf_remove_title_info: When active the Wiki title info will not be displayed in PDF view.
-  label_web_apis: Web APIs
-  label_google_maps_embed_api: Google Maps Embed API Key
-  google_maps_embed_api_html: Si vous souhaitez utiliser la macro Gmap pour afficher les cartes de Goole, veuillez implémenter votre clé API Google Maps ici. Ensuite, vous pouvez utiliser la macro et divers paramètres. Pour plus d'informations sur l'utilisation des paramètres, voir <a href="https://developers.google.com/maps/documentation/embed/guide">https://developers.google.com/maps/documentation/embed/guide</a>. La macro Gmap ne fonctionne qu'en combinaison avec la clé intégrée.
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -41,6 +41,7 @@ it:
  global_wiki_footer_info: 'Enter a project wide wiki footer here. In case a project specific wiki footer is used by "Wiki Extensions", this will be preferably displayed instead.'
  global_wiki_header_info: 'Enter a project wide wiki header here. In case a project specific wiki header is used by "Wiki Extensions", this will be preferably displayed instead.'
  global_wiki_sidebar_info: 'Enter a project wide available text message for your wiki sidebar, here. This sidebar text will be displayed at the wiki pages only. Use this space for Macros like "Last changed pages" for example. In case a project specific sidebar is used (wiki page), this will be preferably displayed in the sidebar instead.'
+  google_maps_embed_api_html: Se si desidera utilizzare la macro Gmap per visualizzare Google Maps, è necessario immettere qui la chiave API incorporata di Google Maps. Potete trovare maggiori informazioni sotto <a href="https://developers.google.com/maps/documentation/embed/guide">https://developers.google.com/maps/documentation/embed/guide</a>
  invisible_captcha_info_html: In case this option is activated an <a href="https://github.com/markets/invisible_captcha" target="_blank">invisible_captcha</a> SPAM protection is activated for the registration page of new users. This function is only available, if you enabled self-registration, too.
  label_account_login: "Testo per la pagina di accesso"
  label_add_go_to_top: 'Add "Go to top" link'
@@ -61,6 +62,7 @@ it:
  label_global_wiki_header: "Project wide wiki header"
  label_global_wiki_sidebar: "Global wiki sidebar"
  label_go_to_top: "Vai in cima"
+  label_google_maps_embed_api: Google Maps Embed API Key
  label_hour: ora
  label_icon_color: Icon colore
  label_invisible_captcha: Protezione SPAM per la pagina di registrazione
@@ -71,6 +73,7 @@ it:
  label_menu_entry: "Menu item"
  label_monthly: mensile
  label_new_ticket_message: "Nota per il nuovo issues"
+  label_open_in_new_windows: Open in new windows
  label_optional: "opzionale"
  label_overview_bottom: "Pagina di panoramica, parte inferiore"
  label_overview_page: "Pagina di panoramica"
@@ -106,6 +109,7 @@ it:
  label_twitter_hashtag: Twitter hashtag
  label_uptime: Uptime
  label_user_list: "User list"
+  label_web_apis: Web APIs
  label_weekly: settimanalmente
  label_wiki_pdf_header: Wiki PDF header
  label_wiki_pdf_remove_attachments: Remove attachments from PDF view
@@ -142,6 +146,3 @@ it:
  wiki_pdf_header_info: This text block will be displayed on the first page before the regular Wiki content in the PDF view. Macro use is very restricted, here.
  wiki_pdf_remove_attachments_info: When active the attached Wiki files will not be displayed in PDF view.
  wiki_pdf_remove_title_info: When active the Wiki title info will not be displayed in PDF view.
-  label_web_apis: Web APIs
-  label_google_maps_embed_api: Google Maps Embed API Key
-  google_maps_embed_api_html: Se si desidera utilizzare la macro Gmap per visualizzare Google Maps, è necessario immettere qui la chiave API incorporata di Google Maps. Potete trovare maggiori informazioni sotto <a href="https://developers.google.com/maps/documentation/embed/guide">https://developers.google.com/maps/documentation/embed/guide</a>
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -41,6 +41,7 @@ ja:
  global_wiki_footer_info: 'プロジェクトのWikiフッターをここで入力する。「Wiki Extensions」等のプロジェクト特有のWikiフッターが使用されている場合、こちらの文章が優先的に表示されます。'
  global_wiki_header_info: 'プロジェクトのWikiヘッダーをここで入力する。「Wiki Extensions」等のプロジェクト特有のWikiヘッダーが使用されている場合、こちらの文章が優先的に表示されます。'
  global_wiki_sidebar_info: 'プロジェクト全体のWikiサイドバーで使用される文章を入力する。このサイドバー文章は、Wikiページのみに表示されます。例えば、「直近変更されたページ」等のマクロで使う事をお勧めします。もしプロジェクト特有のサイドバーが使用されている場合でも、こちらの文章がサイドバーで優先的に表示されます。'
+  google_maps_embed_api_html: In case you want to use the Gmap macro in order to display Goole maps please implement your Google Maps API key here. Afterwards you can use the macro and various paramters. More information on how to use the paramaters are provided at <a href="https://developers.google.com/maps/documentation/embed/guide" target="_blank">https://developers.google.com/maps/documentation/embed/guide</a>. The Gmap macro works only in combination with the embedded key here.
  invisible_captcha_info_html: In case this option is activated an <a href="https://github.com/markets/invisible_captcha" target="_blank">invisible_captcha</a> SPAM protection is activated for the registration page of new users. This function is only available, if you enabled self-registration, too.
  label_account_login: "ログイン画面の文章"
  label_add_go_to_top: '「トップへ」リンクを追加する'
@@ -61,6 +62,7 @@ ja:
  label_global_wiki_header: "プロジェクト全体Wikiヘッダー"
  label_global_wiki_sidebar: "グローバルWikiサイドバー"
  label_go_to_top: "トップへ"
+  label_google_maps_embed_api: Google Maps Embed API Key
  label_hour: hour
  label_icon_color: Icon color
  label_invisible_captcha: SPAM protection for registration
@@ -71,6 +73,7 @@ ja:
  label_menu_entry: "メニュー項目"
  label_monthly: monthly
  label_new_ticket_message: "新規チケットのメモ"
+  label_open_in_new_windows: Open in new windows
  label_optional: "任意"
  label_overview_bottom: "Overview page, bottom"
  label_overview_page: "Overview page"
@@ -106,6 +109,7 @@ ja:
  label_twitter_hashtag: Twitter hashtag
  label_uptime: Uptime
  label_user_list: "ユーザ一覧"
+  label_web_apis: Web APIs
  label_weekly: weekly
  label_wiki_pdf_header: Wiki PDF header
  label_wiki_pdf_remove_attachments: Remove attachments from PDF view
@@ -142,6 +146,3 @@ ja:
  wiki_pdf_header_info: This text block will be displayed on the first page before the regular Wiki content in the PDF view. Macro use is very restricted, here.
  wiki_pdf_remove_attachments_info: When active the attached Wiki files will not be displayed in PDF view.
  wiki_pdf_remove_title_info: When active the Wiki title info will not be displayed in PDF view.
-  label_web_apis: Web APIs
-  label_google_maps_embed_api: Google Maps Embed API Key
-  google_maps_embed_api_html: In case you want to use the Gmap macro in order to display Goole maps please implement your Google Maps API key here. Afterwards you can use the macro and various paramters. More information on how to use the paramaters are provided at <a href="https://developers.google.com/maps/documentation/embed/guide" target="_blank">https://developers.google.com/maps/documentation/embed/guide</a>. The Gmap macro works only in combination with the embedded key here.
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -41,6 +41,7 @@
  global_wiki_footer_info: "專案中Wiki頁尾訊息。若 \"Wiki Extensions\" 外掛設定了Wiki頁尾訊息，則該優先顯示該訊息。"
  global_wiki_header_info: "專案中Wiki頁首訊息。若 \"Wiki Extensions\" 外掛設定了Wiki頁首訊息，則該優先顯示該訊息。"
  global_wiki_sidebar_info: "專案中Wiki側邊訊息。僅在wiki頁內顯示。可輸入如 \"Last changed pages\" 等macro指令。若專案內使用指定的Wiki側邊訊息，則該優先顯示該訊息。"
+  google_maps_embed_api_html: In case you want to use the Gmap macro in order to display Goole maps please implement your Google Maps API key here. Afterwards you can use the macro and various paramters. More information on how to use the paramaters are provided at <a href="https://developers.google.com/maps/documentation/embed/guide" target="_blank">https://developers.google.com/maps/documentation/embed/guide</a>. The Gmap macro works only in combination with the embedded key here.
  invisible_captcha_info_html: In case this option is activated an <a href="https://github.com/markets/invisible_captcha" target="_blank">invisible_captcha</a> SPAM protection is activated for the registration page of new users. This function is only available, if you enabled self-registration, too.
  label_account_login: "登入頁文字"
  label_add_go_to_top: "增加 \"回到頁首\" 連結"
@@ -61,6 +62,7 @@
  label_global_wiki_header: "專案中Wiki頁首訊息設定"
  label_global_wiki_sidebar: "專案中Wiki側邊設定"
  label_go_to_top: "回到頁首"
+  label_google_maps_embed_api: Google Maps Embed API Key
  label_hour: 小時
  label_icon_color: 圖示顏色
  label_invisible_captcha: "註冊SPAM保護"
@@ -71,6 +73,7 @@
  label_menu_entry: "選單項"
  label_monthly: 每月
  label_new_ticket_message: "建立新議題時的提示訊息"
+  label_open_in_new_windows: Open in new windows
  label_optional: "選擇性"
  label_overview_bottom: "概觀頁頁尾"
  label_overview_page: "概觀頁"
@@ -106,6 +109,7 @@
  label_twitter_hashtag: "Twitter #標籤"
  label_uptime: "上線時間"
  label_user_list: "用戶列表"
+  label_web_apis: Web APIs
  label_weekly: "每周"
  label_wiki_pdf_header: "Wiki PDF 頁首"
  label_wiki_pdf_remove_attachments: "在 PDF 中刪除附件"
@@ -142,6 +146,3 @@
  wiki_pdf_header_info: "該訊息將顯示在PDF第一頁頁首。此處macros指令支援有限。"
  wiki_pdf_remove_attachments_info: "當啟用時，Wiki附件將不會顯示在PDF中。"
  wiki_pdf_remove_title_info: "當啟用時，Wiki標題訊息不會顯示在PDF中"
-  label_web_apis: Web APIs
-  label_google_maps_embed_api: Google Maps Embed API Key
-  google_maps_embed_api_html: In case you want to use the Gmap macro in order to display Goole maps please implement your Google Maps API key here. Afterwards you can use the macro and various paramters. More information on how to use the paramaters are provided at <a href="https://developers.google.com/maps/documentation/embed/guide" target="_blank">https://developers.google.com/maps/documentation/embed/guide</a>. The Gmap macro works only in combination with the embedded key here.
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -41,6 +41,7 @@ zh:
  global_wiki_footer_info: '请在此处输入项目范围内的 WIKI 页脚信息。若"Wiki Extensions"插件使用了指定的WIKI页脚，则该信息会被优先显示。'
  global_wiki_header_info: '请在此处输入项目范围内的 WIKI 页首信息。若"Wiki Extensions"插件使用了指定的WIKI页首，则该信息会被优先显示。'
  global_wiki_sidebar_info: '请在此处输入项目范围内的 WIKI 侧边栏信息。该侧边栏信息将只显示在WIKI页内。在此空间内输入诸如 "Last changed pages" 的宏命令。若项目内使用指定的侧边栏（WIKI页），则该信息将优先显示在侧边栏内。'
+  google_maps_embed_api_html: In case you want to use the Gmap macro in order to display Goole maps please implement your Google Maps API key here. Afterwards you can use the macro and various paramters. More information on how to use the paramaters are provided at <a href="https://developers.google.com/maps/documentation/embed/guide" target="_blank">https://developers.google.com/maps/documentation/embed/guide</a>. The Gmap macro works only in combination with the embedded key here.
  invisible_captcha_info_html: In case this option is activated an <a href="https://github.com/markets/invisible_captcha" target="_blank">invisible_captcha</a> SPAM protection is activated for the registration page of new users. This function is only available, if you enabled self-registration, too.
  label_account_login: "用于登陆页的文本"
  label_add_go_to_top: '添加 "回到页首" 链接'
@@ -61,6 +62,7 @@ zh:
  label_global_wiki_header: "项目范围内的页首设置"
  label_global_wiki_sidebar: "全局 WIKI 侧边栏设置"
  label_go_to_top: "回到页首"
+  label_google_maps_embed_api: Google Maps Embed API Key
  label_hour: 小时
  label_icon_color: 图标颜色
  label_invisible_captcha: SPAM protection for registration
@@ -71,6 +73,7 @@ zh:
  label_menu_entry: "菜单项"
  label_monthly: 每月
  label_new_ticket_message: "用于新建问题时的提示信息"
+  label_open_in_new_windows: Open in new windows
  label_optional: "可选项"
  label_overview_bottom: "概述页底部"
  label_overview_page: "概述页"
@@ -106,6 +109,7 @@ zh:
  label_twitter_hashtag: Twitter 哈希标签
  label_uptime: Uptime
  label_user_list: "用户列表"
+  label_web_apis: Web APIs
  label_weekly: 每周
  label_wiki_pdf_header: Wiki PDF 页头
  label_wiki_pdf_remove_attachments: 从 PDF 中删除附件
@@ -142,6 +146,3 @@ zh:
  wiki_pdf_header_info: 该文本快将显示在 PDF 视图中的常规 WIKI 内容之前的第一页上。此处宏命令的使用非常有限。
  wiki_pdf_remove_attachments_info:  当启用时，WIKI 附件将不会显示在PDF视图中。
  wiki_pdf_remove_title_info: 当启用时，WIKI 标题信息将不会显示在PDF视图中。
-  label_web_apis: Web APIs
-  label_google_maps_embed_api: Google Maps Embed API Key
-  google_maps_embed_api_html: In case you want to use the Gmap macro in order to display Goole maps please implement your Google Maps API key here. Afterwards you can use the macro and various paramters. More information on how to use the paramaters are provided at <a href="https://developers.google.com/maps/documentation/embed/guide" target="_blank">https://developers.google.com/maps/documentation/embed/guide</a>. The Gmap macro works only in combination with the embedded key here.
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -96,7 +96,26 @@ Features
 * welcome text for login page
 * global sidebar content support
 * set info message above new ticket (e.g. for guidelines)
-* Wiki macros for: date, Gihub gist, gmap, group_users, issues, meteoblue, members, projects slideshare, twitter, reddit, tradingview, cryptocompare, user, youtube and vimeo
+* wiki macros for:
+
+  * cryptocompare
+  * date,
+  * gihub gist
+  * gmap
+  * group_users
+  * iframe
+  * issues
+  * members
+  * meteoblue
+  * projects
+  * reddit
+  * slideshare
+  * tradingview
+  * twitter
+  * user
+  * vimeo
+  * youtube
+
 * option to remove "my page" from top menu
 * customize "Help" url in top menu
 * customize top menu items
@@ -104,11 +123,11 @@ Features
 * open external urls in new window
 * smiley/emoji legacy support
 * anonymize referrer for external urls
-* Hide role in project memberbox
-* Change issue author
+* hide role in project memberbox
+* change issue author
 * spam protection on registration form
-* Add involved issue users as watcher automatically
-* Configurable issue rules
+* add involved issue users as watcher automatically
+* configurable issue rules

  * closing issue with open sub issues
  * change assigned_to automatically, if issue status changes
--- a/docs/macros.rst
+++ b/docs/macros.rst
@@ -11,6 +11,7 @@ If a parameter is in brackets, this parameter is optional.
 .. include:: macros/gist.rst
 .. include:: macros/gmap.rst
 .. include:: macros/group_users.rst
+.. include:: macros/iframe.rst
 .. include:: macros/issue.rst
 .. include:: macros/last_updated_at.rst
 .. include:: macros/last_updated_by.rst
--- a/docs/macros/iframe.rst
+++ b/docs/macros/iframe.rst
@@ -0,0 +1,35 @@
+Iframe
+------
+
+Iframe macro for Redmine.
+
+.. function:: {{iframe(url [, width=INT, height=INT, with_link=BOOL])}}
+
+    Include an Iframe into Redmine. If your Redmine is running with HTTPS, only iframes with
+    HTTPS are accepted by this macro.
+
+    Note: you can only include an iframe, if the website of the iframe url does allow it. If not, you
+    will get a empty page with the HTTP header info:
+
+    ``Load denied by X-Frame-Options: https://alphanodes.com/slides/redmine-cheat-sheet-macros.html#/ does not permit cross-origin framing.``
+
+    :param string url: URL to website
+    :param int width: width (default is 100%)
+    :param int height: height (default is 485)
+    :param bool with_link: true or false (if link to url should be displayed below iframe)
+
+Examples
++++++++
+
+
+Show iframe of URL ``https://www.google.com/``
+
+.. code-block:: smarty
+
+  {{iframe(https://www.google.com/)}}
+
+Show iframe of URL https://www.google.com/ and show link to it
+
+.. code-block:: smarty
+
+  {{iframe(https://www.google.com/, with_link: true)}}
--- a/docs/macros/issue.rst
+++ b/docs/macros/issue.rst
@@ -1,5 +1,5 @@
 Issue
----
+-----

 Issue wiki macro for Redmine.

--- a/docs/macros/slideshare.rst
+++ b/docs/macros/slideshare.rst
@@ -1,5 +1,5 @@
 Slideshare
-------
+----------

 Slideshare wiki macro for Redmine.

--- a/docs/macros/vimeo.rst
+++ b/docs/macros/vimeo.rst
@@ -1,5 +1,5 @@
 Vimeo
-------
+-----

 Vimeo wiki macro for Redmine.

--- a/init.rb
+++ b/init.rb
@@ -5,7 +5,7 @@ Redmine::Plugin.register :additionals do
  name 'Additionals'
  author 'AlphaNodes GmbH'
  description 'Customizing Redmine, providing wiki macros and act as a library/function provider for other Redmine plugins'
-  version '2.0.5'
+  version '2.0.6'
  author_url 'https://alphanodes.com/'
  url 'https://github.com/alphanodes/additionals'

--- a/lib/additionals.rb
+++ b/lib/additionals.rb
@@ -99,9 +99,9 @@ if ActiveRecord::Base.connection.table_exists?(:settings)
    require_dependency 'additionals/hooks'

    # Macros
-    Additionals.load_macros(%w[calendar cryptocompare date gist gmap group_users issue last_updated_at
-                               last_updated_by meteoblue member project recently_updated reddit slideshare
-                               tradingview twitter user vimeo youtube])
+    Additionals.load_macros(%w[calendar cryptocompare date gist gmap group_users iframe issue
+                               last_updated_at last_updated_by meteoblue member project recently_updated
+                               reddit slideshare tradingview twitter user vimeo youtube])
  end

  # include deface overwrites
--- a/lib/additionals/helpers.rb
+++ b/lib/additionals/helpers.rb
@@ -370,20 +370,6 @@ module Additionals
      safe_join(s)
    end

-    def query_default_sort(query, fall_back_sort)
-      criteria = query.sort_criteria.any? ? query.sort_criteria : fall_back_sort
-      return unless criteria.is_a?(Array)
-      sql = []
-      criteria.each do |sort|
-        name = sort[0]
-        field = []
-        field << query.queried_class.table_name if name == 'name'
-        field << name
-        sql << "#{field.join('.')} #{sort[1].upcase}"
-      end
-      sql.join(', ')
-    end
-
    def options_for_menu_select(active)
      options_for_select({ l(:button_hide) => '',
                           l(:label_top_menu) => 'top',
--- a/lib/additionals/wiki_macros/calendar_macro.rb
+++ b/lib/additionals/wiki_macros/calendar_macro.rb
@@ -15,9 +15,8 @@ module Additionals
  DESCRIPTION

      macro :calendar do |_obj, args|
-        args, options = extract_macro_options(args, :show_weeks, :year, :month, :select)
        raise 'Only works on wiki page' unless controller_name == 'wiki' && action_name == 'show'
-
+        _args, options = extract_macro_options(args, :show_weeks, :year, :month, :select)
        options[:show_weeks] = 'false' if options[:show_weeks].blank?
        options[:year] = Time.zone.now.year.to_s if options[:year].blank?
        options[:month] = Time.zone.now.month.to_s if options[:month].blank?
--- a/lib/additionals/wiki_macros/iframe_macro.rb
+++ b/lib/additionals/wiki_macros/iframe_macro.rb
@@ -0,0 +1,63 @@
+# Slideshare wiki macros
+module Additionals
+  module WikiMacros
+    Redmine::WikiFormatting::Macros.register do
+      desc <<-DESCRIPTION
+  Include iframe
+
+    Syntax:
+
+    {{iframe(<url> [, width=100%, height=485)}}
+
+    Examples:
+
+    show iframe of URL https://www.google.com/
+    {{iframe(https://www.google.com/)}}
+
+    show iframe of URL https://www.google.com/ and show link to it
+    {{iframe(https://www.google.com/, with_link: true)}}
+  DESCRIPTION
+
+      macro :iframe do |_obj, args|
+        args, options = extract_macro_options(args, :width, :height, :slide, :with_link)
+
+        width = options[:width].present? ? options[:width] : '100%'
+        height = options[:height].present? ? options[:height] : 485
+
+        if args.empty?
+          raise 'The correct usage is {{iframe(<url>[, width=x, height=y, with_link=bool])}}'
+        end
+
+        src = args[0]
+        if Additionals.valid_iframe_url?(src)
+          s = [content_tag(:iframe,
+                           '',
+                           width: width,
+                           height: height,
+                           src: src,
+                           frameborder: 0,
+                           allowfullscreen: 'true')]
+          if !options[:with_link].nil? && Additionals.true?(options[:with_link])
+            s << link_to(l(:label_open_in_new_windows), src, class: 'external')
+          end
+          safe_join(s)
+        elsif Setting.protocol == 'https'
+          raise 'Invalid url provided to iframe (only full URLs with protocol HTTPS are accepted)'
+        else
+          raise 'Invalid url provided to iframe (only full URLs are accepted)'
+        end
+      end
+    end
+  end
+
+  def self.valid_iframe_url?(url)
+    uri = URI.parse(url)
+    if Setting.protocol == 'https'
+      uri.is_a?(URI::HTTPS) && !uri.host.nil?
+    else
+      !uri.host.nil?
+    end
+  rescue URI::InvalidURIError
+    false
+  end
+end
--- a/lib/additionals/wiki_macros/meteoblue_macro.rb
+++ b/lib/additionals/wiki_macros/meteoblue_macro.rb
@@ -1,4 +1,4 @@
-# Gist wiki macros
+# meteoblue wiki macros
 module Additionals
  module WikiMacros
    Redmine::WikiFormatting::Macros.register do
--- a/lib/additionals/wiki_macros/slideshare_macro.rb
+++ b/lib/additionals/wiki_macros/slideshare_macro.rb
@@ -11,25 +11,19 @@ module Additionals

    Examples:

-    {{slideshare(57941706)}} show slideshare slid with default size 595x485
-    {{slideshare(57941706, width=514, height=422)}} show video with user defined size
+    {{slideshare(57941706)}} show slideshare slide with default size 595x485
+    {{slideshare(57941706, width=514, height=422)}} show slide with user defined size
    {{slideshare(57941706, slide=5)}} start with slide (page) 5
  DESCRIPTION

      macro :slideshare do |_obj, args|
        args, options = extract_macro_options(args, :width, :height, :slide)

-        width = 595
-        height = 485
-        slide = 0
+        width = options[:width].present? ? options[:width] : 595
+        height = options[:height].present? ? options[:height] : 485
+        slide = options[:slide].present? ? options[:slide].to_i : 0

-        width = options[:width] if options[:width].present?
-        height = options[:height] if options[:height].present?
-        slide = options[:slide].to_i if options[:slide].present?
-
-        if (options[:width].blank? && options[:height].present?) ||
-           (options[:width].present? && options[:height].blank?) ||
-           args.empty?
+        if args.empty?
          raise 'The correct usage is {{slideshare(<key>[, width=x, height=y, slide=number])}}'
        end

--- a/lib/additionals/wiki_macros/vimeo_macro.rb
+++ b/lib/additionals/wiki_macros/vimeo_macro.rb
@@ -28,9 +28,7 @@ module Additionals
                     false
                   end

-        if (options[:width].blank? && options[:height].present?) ||
-           (options[:width].present? && options[:height].blank?) ||
-           args.empty?
+        if args.empty?
          raise 'The correct usage is {{vimeo(<video key>[, width=x, height=y])}}'
        end

--- a/lib/additionals/wiki_macros/youtube_macro.rb
+++ b/lib/additionals/wiki_macros/youtube_macro.rb
@@ -28,9 +28,7 @@ module Additionals
                     false
                   end

-        if (options[:width].blank? && options[:height].present?) ||
-           (options[:width].present? && options[:height].blank?) ||
-           args.empty?
+        if args.empty?
          raise 'The correct usage is {{youtube(<video key>[, width=x, height=y])}}'
        end