Skip to content
This repository was archived by the owner on May 28, 2021. It is now read-only.

Commit 94d9385

Browse files
author
Jens Krumsieck
committed
adding && fixing
1 parent 7be9470 commit 94d9385

File tree

10 files changed

+17
-19
lines changed

10 files changed

+17
-19
lines changed

‎files/lib/system/cronjob/CheckLinksCronjob.class.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
use wcf\system\cronjob\AbstractCronjob;
55
use linklist\data\link\LinkEditor;
66
use linklist\data\link\Link;
7+
use linklist\data\link\LinkList;
78
use linklist\system\moderation\queue\ModerationQueueOfflineManager;
89
use wcf\system\WCF;
910

‎files/style/linklist.less‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@
6969
}
7070

7171
.linkImage {
72-
float: right;
72+
float: left;
7373
border-radius: @wcfButtonBorderRadius;
7474
padding: 10px;
7575
background: @wcfContainerAccentBackgroundColor;
76-
margin-left: 20px;
76+
margin-right: 20px;
7777
border: @wcfContainerBorderColor solid 1px;
7878

7979
}

‎language/de.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ Unser neuestes Mitglied heißt: <a href="{link controller='User' object=$stats[n
137137
<item name="wcf.acp.option.linklist_enable_tags"><![CDATA[Tagging von Links aktivieren
138138
]]></item>
139139
<item name="wcf.acp.option.linklist_enable_own_preview"><![CDATA[Eigene Vorschaubilder]]></item>
140+
<item name="wcf.acp.option.linklist_enable_image_preview"><![CDATA[Screenshot im Text anzeigen]]></item>
140141
<item name="wcf.acp.option.linklist_enable_own_preview.description"><![CDATA[Benutzer können eigene Vorschaubilder für Links hochladen/verlinken.]]></item>
141142
<item name="wcf.acp.option.linklist_enable_tags.description"><![CDATA[Benutzer können Links Tags zuweisen, die in Tag-Wolken zusammengefasst werden.]]></item>
142143
<item name="wcf.acp.option.linklist_default_sort_field"><![CDATA[Sortierung]]></item>

‎language/en.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ The newest Member is: <a href="{link controller='User' object=$stats[newestMembe
122122
<item name="wcf.acp.option.category.linklist.general"><![CDATA[General]]></item>
123123
<item name="wcf.acp.option.category.linklist.general.settings"><![CDATA[Settings]]></item>
124124
<item name="wcf.acp.option.linklist_enable_croncheck"><![CDATA[Active Cronjob]]></item>
125+
<item name="wcf.acp.option.linklist_enable_image_preview"><![CDATA[Screenshot in Linktext]]></item>
125126
<item name="wcf.acp.option.linklist_enable_croncheck.description"><![CDATA[Activates a Cronjob for checking availability of links]]></item>
126127
<item name="wcf.acp.option.module_linklist_comments"><![CDATA[Commentsystem - Linklist]]></item>
127128
<item name="wcf.acp.option.category.linklist"><![CDATA[Linklist]]></item>

‎templates/dashboardBoxRandomLink.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<div class="details">
1919
<div class="containerHeadline">
2020
<h3>
21-
{if $randomLink->isOnline == 0}<span class="badge label red">{lang}linklist.link.offline{/lang}</span>{/if}
21+
{if $randomLink->isOnline == 0 && LINKLIST_ENABLE_CRONCHECK}<span class="badge label red">{lang}linklist.link.offline{/lang}</span>{/if}
2222
{foreach from=$randomLink->getLabels() item=label}
2323
<span class="label badge{if $label->getClassNames()} {$label->getClassNames()}{/if}">{lang}{$label->label}{/lang}</span>
2424
{/foreach}

‎templates/link.tpl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<header class="boxHeadline labeledHeadline">
4444
<h1>{$link->getTitle()|language}</h1>
4545
<ul class="labelList">
46-
{if $link->isOnline == 0}<li><span class="badge label red">{lang}linklist.link.offline{/lang}</span></li>{/if}
46+
{if $link->isOnline == 0 && LINKLIST_ENABLE_CRONCHECK}<li><span class="badge label red">{lang}linklist.link.offline{/lang}</span></li>{/if}
4747

4848
{foreach from=$link->getLabels() item=label}
4949
<li><span class="label badge{if $label->getClassNames()} {$label->getClassNames()}{/if}">{lang}{$label->label}{/lang}</span></li>
@@ -82,9 +82,9 @@
8282
</header>
8383
<div class="messageBody">
8484
<div>
85-
<div class="linkImage">
85+
{if LINK_ENABLE_IMAGE_PREVIEW}<div class="linkImage">
8686
<a class="framed" href="{link application='linklist' controller='LinkVisit' object=$link}{/link}" {if EXTERNAL_LINK_TARGET_BLANK}target="_blank"{/if}><img src="http://api.webthumbnail.org?width=200&amp;height=200&amp;screen=1280&amp;format=png&amp;url={$link->url}" alt="Captured by webthumbnail.org" class="previewImage" /></a>
87-
</div>
87+
</div>{/if}
8888
<div class="messageText">
8989
{@$link->getFormattedMessage()}
9090

‎templates/linkAdd.tpl‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,16 +164,15 @@
164164
<legend>
165165
{lang}linklist.link.link{$action|ucfirst}.text{/lang}
166166
</legend>
167-
<dl>
168-
<dt></dt>
167+
169168
<dd>
170169
<textarea id="text" name="text" rows="20" cols="40">{if $text|isset}{$text}{/if}</textarea>
171170
{if $errorField == 'text'}
172171
<small class="innerError">{if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if}
173172
</small>
174173
{/if}
175174
</dd>
176-
</dl>
175+
177176
</fieldset>
178177
{if $useCaptcha}{include file='recaptcha'}{/if}
179178
{include file='messageFormTabs' wysiwygContainerID='text'}

‎templates/linkSidebar.tpl‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,6 @@
1616
<small>{$link->getTitle()|language}</small>
1717
</div>
1818
</li>
19-
<li class="box24">
20-
<a class="framed" href="{link controller='User' id=$link->getUserID() title=$link->getUsername()}{/link}">
21-
{@$link->getUserProfile()->getAvatar()->getImageTag(24)}
22-
</a>
23-
<div class="sidebarBoxHeadline">
24-
<h3>{lang}linklist.link.sidebar.author{/lang}</h3>
25-
<small>{if $link->getUserID()}<a class="userLink" data-user-id="{$link->getUserID()}" href="{link controller='User' id=$link->getUserID() title=$link->getUsername()}{/link}">{$link->getUsername()}</a>{else}{$link->getUsername()}{/if}</small>
26-
</div>
27-
</li>
2819
<li class="box24">
2920
<span class="icon icon32 icon-external-link"></span>
3021
<div class="sidebarBoxHeadline">

‎templates/linksList.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<div class="details">
1515
<div class="containerHeadline">
1616
<h3>
17-
{if $link->isOnline == 0}<span class="badge label red">{lang}linklist.link.offline{/lang}</span>{/if}
17+
{if $link->isOnline == 0 && LINKLIST_ENABLE_CRONCHECK}<span class="badge label red">{lang}linklist.link.offline{/lang}</span>{/if}
1818
{foreach from=$link->getLabels() item=label}
1919
<span class="label badge{if $label->getClassNames()} {$label->getClassNames()}{/if}">{lang}{$label->label}{/lang}</span>
2020
{/foreach}

‎xml/option.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,11 @@
9292
<optiontype>boolean</optiontype>
9393
<defaultvalue>1</defaultvalue>
9494
</option>
95+
<option name="linklist_enable_image_preview">
96+
<categoryname>linklist.links.general</categoryname>
97+
<optiontype>boolean</optiontype>
98+
<defaultvalue>1</defaultvalue>
99+
</option>
95100
<option name="linklist_enable_tags">
96101
<categoryname>linklist.links.general</categoryname>
97102
<optiontype>boolean</optiontype>

0 commit comments

Comments
 (0)