From 44dbbfeaee3df3e66303784ae5867ca05f6c5e47 Mon Sep 17 00:00:00 2001
From: DanielSeifert <ds@shopmodule.com>
Date: Fri, 23 Jan 2015 09:13:45 +0000
Subject: [PATCH] move changed_full content to copy_this

---
 .gitattributes                                |  3 +-
 .../blocks/layout/d3usersonline_sidebar.tpl   | 49 -------------------
 .../blocks/layout/d3usersonline_sidebar.tpl   |  0
 3 files changed, 1 insertion(+), 51 deletions(-)
 delete mode 100644 changed_full/PE470-/modules/d3/d3usersonline/views/blocks/layout/d3usersonline_sidebar.tpl
 rename {changed_full/EE500- => copy_this}/modules/d3/d3usersonline/views/blocks/layout/d3usersonline_sidebar.tpl (100%)

diff --git a/.gitattributes b/.gitattributes
index 07d7a35..72c81d7 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,6 +1,4 @@
 * text=auto !eol
-changed_full/EE500-/modules/d3/d3usersonline/views/blocks/layout/d3usersonline_sidebar.tpl -text
-changed_full/PE470-/modules/d3/d3usersonline/views/blocks/layout/d3usersonline_sidebar.tpl -text
 copy_this/.noencode -text
 copy_this/modules/d3/d3usersonline/metadata.php -text
 copy_this/modules/d3/d3usersonline/models/d3usersonline.php -text
@@ -9,6 +7,7 @@ copy_this/modules/d3/d3usersonline/modules/components/d3_oxcmp_utils_usersonline
 copy_this/modules/d3/d3usersonline/picture.png -text
 copy_this/modules/d3/d3usersonline/translations/de/d3usersonline_lang.php -text
 copy_this/modules/d3/d3usersonline/translations/en/d3usersonline_lang.php -text
+copy_this/modules/d3/d3usersonline/views/blocks/layout/d3usersonline_sidebar.tpl -text
 setup+doku/Installation.pdf -text
 setup+doku/changelog.txt -text
 setup+doku/d3precheck.php -text
diff --git a/changed_full/PE470-/modules/d3/d3usersonline/views/blocks/layout/d3usersonline_sidebar.tpl b/changed_full/PE470-/modules/d3/d3usersonline/views/blocks/layout/d3usersonline_sidebar.tpl
deleted file mode 100644
index 8717382..0000000
--- a/changed_full/PE470-/modules/d3/d3usersonline/views/blocks/layout/d3usersonline_sidebar.tpl
+++ /dev/null
@@ -1,49 +0,0 @@
-[{d3modcfgcheck modid="d3usersonline"}]
-    [{if $oxcmp_user && $oxcmp_user->getFieldData('oxrights') == 'malladmin'}]
-        <div class="box">
-            <h3>[{oxmultilang ident="D3_USERSONLINE_USERSONLINE"}]</h3>
-            <div class="content">
-                <table style="border-style: none; width: 100%;">
-                    <tr>
-                        <td style="border-bottom: 1px solid silver;">
-                            [{oxmultilang ident="D3_USERSONLINE_ALL"}]
-                        </td>
-                        <td style="border-bottom: 1px solid silver; text-align: right; font-weight: bold;">
-                            [{$aUsersOnline.all}]&nbsp;
-                        </td>
-                        <td style="border-bottom: 1px solid silver; text-align: left;">
-                            [{if $aUsersOnline.all == 1}]
-                                [{oxmultilang ident="D3_USERSONLINE_USER"}]
-                            [{else}]
-                                [{oxmultilang ident="D3_USERSONLINE_USERS"}]
-                            [{/if}]
-                        </td>
-                    </tr>
-                    [{foreach from=$aUsersOnline.classes item="aClassUser"}]
-                        <tr>
-                            <td>
-                                [{if $aClassUser->classname}]
-                                    [{$aClassUser->classname|ucfirst}]:
-                                [{else}]
-                                    undefined:
-                                [{/if}]
-                            </td>
-                            <td style="text-align: right; font-weight: bold;">
-                                [{$aClassUser->counter}]&nbsp;
-                            </td>
-                            <td style="text-align: left;">
-                                [{if $aClassUser->counter == 1}]
-                                    [{oxmultilang ident="D3_USERSONLINE_USER"}]
-                                [{else}]
-                                    [{oxmultilang ident="D3_USERSONLINE_USERS"}]
-                                [{/if}]
-                            </td>
-                        </tr>
-                    [{/foreach}]
-                </table>
-            </div>
-        </div>
-    [{/if}]
-[{/d3modcfgcheck}]
-
-[{$smarty.block.parent}]
\ No newline at end of file
diff --git a/changed_full/EE500-/modules/d3/d3usersonline/views/blocks/layout/d3usersonline_sidebar.tpl b/copy_this/modules/d3/d3usersonline/views/blocks/layout/d3usersonline_sidebar.tpl
similarity index 100%
rename from changed_full/EE500-/modules/d3/d3usersonline/views/blocks/layout/d3usersonline_sidebar.tpl
rename to copy_this/modules/d3/d3usersonline/views/blocks/layout/d3usersonline_sidebar.tpl