| Index: trunk/extensions/Collection/Collection.i18n.php |
| — | — | @@ -82,12 +82,12 @@ |
| 83 | 83 | 'coll-empty_collection' => 'Empty book', |
| 84 | 84 | 'coll-revision' => 'Revision: $1', |
| 85 | 85 | 'coll-save_collection_title' => 'Save and share your book', |
| 86 | | - 'coll-save_collection_text' => 'Choose a location:', |
| | 86 | + 'coll-save_collection_text' => 'Choose a storage location for your book:', |
| 87 | 87 | 'coll-login_to_save' => 'If you want to save books for later use, please [[Special:UserLogin|log in or create an account]].', |
| 88 | 88 | 'coll-personal_collection_label' => 'Personal book:', |
| 89 | 89 | 'coll-community_collection_label' => 'Community book:', |
| 90 | 90 | 'coll-save_collection' => 'Save book', |
| 91 | | - 'coll-save_category' => 'Books are saved in the category [[:Category:{{MediaWiki:Coll-bookscategory}}|{{MediaWiki:Coll-bookscategory}}]].', |
| | 91 | + 'coll-save_category' => 'All books are saved in the category [[:Category:{{MediaWiki:Coll-bookscategory}}|{{MediaWiki:Coll-bookscategory}}]].', |
| 92 | 92 | 'coll-overwrite_title' => 'Page exists. |
| 93 | 93 | Overwrite?', |
| 94 | 94 | 'coll-overwrite_text' => 'A page with the name [[:$1]] already exists. |
| — | — | @@ -1004,12 +1004,12 @@ |
| 1005 | 1005 | 'coll-empty_collection' => 'Leeres Buch', |
| 1006 | 1006 | 'coll-revision' => 'Version: $1', |
| 1007 | 1007 | 'coll-save_collection_title' => 'Speichere und teile dein Buch', |
| 1008 | | - 'coll-save_collection_text' => 'Wähle einen Ort:', |
| | 1008 | + 'coll-save_collection_text' => 'Wähle einen Speicherort für dein Buch:', |
| 1009 | 1009 | 'coll-login_to_save' => 'Wenn du Bücher speichern möchtest, [[Special:UserLogin|melde dich bitte an oder erstelle ein Benutzerkonto]].', |
| 1010 | 1010 | 'coll-personal_collection_label' => 'Persönliches Buch:', |
| 1011 | 1011 | 'coll-community_collection_label' => 'Gemeinschaftliches Buch:', |
| 1012 | 1012 | 'coll-save_collection' => 'Buch speichern', |
| 1013 | | - 'coll-save_category' => 'Bücher werden in der Kategorie [[:Category:{{MediaWiki:Coll-bookscategory}}|{{MediaWiki:Coll-bookscategory}}]] gespeichert.', |
| | 1013 | + 'coll-save_category' => 'Alle Bücher werden der Kategorie [[:Category:{{MediaWiki:Coll-bookscategory}}|{{MediaWiki:Coll-bookscategory}}]] zugeordnet.', |
| 1014 | 1014 | 'coll-overwrite_title' => 'Seite vorhanden, überschreiben?', |
| 1015 | 1015 | 'coll-overwrite_text' => 'Eine Seite mit dem Namen [[:$1]] ist bereits vorhanden. Möchtest du sie durch dein Buch ersetzen?', |
| 1016 | 1016 | 'coll-yes' => 'Ja', |
| Index: trunk/extensions/Collection/Collection.templates.php |
| — | — | @@ -62,8 +62,9 @@ |
| 63 | 63 | <?php foreach ($this->data['podpartners'] as $partner => $partnerData) { ?> |
| 64 | 64 | <form action="<?php echo htmlspecialchars(SkinTemplate::makeSpecialUrlSubpage('Book', 'post_zip/')) ?>" method="get"> |
| 65 | 65 | <input type="hidden" name="partner" value="<?php echo htmlspecialchars($partner) ?>"/> |
| 66 | | - <input type="submit" value="<?php echo wfMsgHtml('coll-order_from_pp', htmlspecialchars($partnerData['name'])) ?>" class="order" <?php if (count($this->data['collection']['items']) == 0) { ?> disabled="disabled"<?php } ?> /> |
| 67 | | - <a href="<?php echo htmlspecialchars($partnerData['url']) ?>" target="_blank"><?php echo wfMsgHtml('coll-about_pp', htmlspecialchars($partnerData['name'])) ?> <img src="<?php echo htmlspecialchars($partnerData['logourl']) ?>" alt="<?php echo htmlspecialchars($partnerData['name']) ?>"/></a> |
| | 66 | + <table style="width:100%; background-color: transparent;"><tr><td><a href="<?php echo htmlspecialchars($partnerData['url']) ?>" target="_blank"><?php echo wfMsgHtml('coll-about_pp', htmlspecialchars($partnerData['name'])) ?> <img src="<?php echo htmlspecialchars($partnerData['logourl']) ?>" alt="<?php echo htmlspecialchars($partnerData['name']) ?>"/></a></td> |
| | 67 | + <td style="text-align:right"><input type="submit" value="<?php echo wfMsgHtml('coll-order_from_pp', htmlspecialchars($partnerData['name'])) ?>" class="order" <?php if (count($this->data['collection']['items']) == 0) { ?> disabled="disabled"<?php } ?> /></td></tr></table> |
| | 68 | + |
| 68 | 69 | </form> |
| 69 | 70 | <?php } ?> |
| 70 | 71 | </div> |
| — | — | @@ -88,7 +89,7 @@ |
| 89 | 90 | <?php } ?> |
| 90 | 91 | </select> |
| 91 | 92 | <?php } ?> |
| 92 | | - <input id="downloadButton" type="submit" value="<?php echo $buttonLabel ?>"<?php if (count($this->data['collection']['items']) == 0) { ?> disabled="disabled"<?php } ?> /> |
| | 93 | + <table style="width:100%; background-color: transparent;"><tr><td style="text-align:right"><input id="downloadButton" type="submit" value="<?php echo $buttonLabel ?>"<?php if (count($this->data['collection']['items']) == 0) { ?> disabled="disabled"<?php } ?> /></td></tr></table> |
| 93 | 94 | </form> |
| 94 | 95 | </div> |
| 95 | 96 | |
| — | — | @@ -96,16 +97,29 @@ |
| 97 | 98 | <h2><span class="mw-headline"><?php $this->msg('coll-save_collection_title') ?></span></h2> |
| 98 | 99 | <?php if ($GLOBALS['wgUser']->isLoggedIn()) { ?> |
| 99 | 100 | <?php $this->msgWiki('coll-save_collection_text') ?> |
| | 101 | + <?php |
| | 102 | + $searchscript = $GLOBALS['wgServer'] . $GLOBALS['wgScript'] . '?title=Special%3APrefixindex&from='; |
| | 103 | + $bookname = wfMsg('coll-collections'); |
| | 104 | + $communityCollNS = $GLOBALS['wgCommunityCollectionNamespace']; |
| | 105 | + ?> |
| 100 | 106 | <form id="saveForm" action="<?php echo htmlspecialchars(SkinTemplate::makeSpecialUrlSubpage('Book', 'save_collection/')) ?>" method="post"> |
| | 107 | + <table style="width:100%; background-color: transparent;"><tr><td> |
| 101 | 108 | <input id="personalCollType" type="radio" name="colltype" value="personal" checked="checked" /> |
| 102 | | - <label for="personalCollType"><?php $this->msg('coll-personal_collection_label') ?></label> |
| 103 | | - <label for="personalCollTitle"><?php echo htmlspecialchars($GLOBALS['wgUser']->getUserPage()->getPrefixedText() . '/' . wfMsgForContent('coll-collections') . '/') ?></label> |
| 104 | | - <input id="personalCollTitle" type="text" name="pcollname" /><br /> |
| | 109 | + <label for="personalCollTitle"><?php echo '<a href="' . $searchscript . $GLOBALS['wgUser']->getName() . '/' . $bookname . '%2F&namespace=2">'.htmlspecialchars($GLOBALS['wgUser']->getUserPage()->getPrefixedText() . '/' . wfMsgForContent('coll-collections') . '/').'</a>' ?></label> |
| | 110 | + </td> |
| | 111 | + <td style="text-align:right;"> |
| | 112 | + <input id="personalCollTitle" type="text" name="pcollname" /> |
| | 113 | + </td></tr> |
| | 114 | + <tr><td> |
| 105 | 115 | <input id="communityCollType" type="radio" name="colltype" value="community" /> |
| 106 | | - <label for="communityCollType"><?php $this->msg('coll-community_collection_label') ?></label> |
| 107 | | - <label for="communityCollTitle"><?php echo htmlspecialchars(Title::makeTitle($GLOBALS['wgCommunityCollectionNamespace'], wfMsgForContent('coll-collections'))->getPrefixedText() . '/') ?></label> |
| 108 | | - <input id="communityCollTitle" type="text" name="ccollname" disabled="disabled" /><br /> |
| | 116 | + <label for="communityCollTitle"><?php echo '<a href="' . $searchscript . $bookname . '%2F&namespace='.$communityCollNS.'">' . htmlspecialchars(Title::makeTitle($GLOBALS['wgCommunityCollectionNamespace'], wfMsgForContent('coll-collections'))->getPrefixedText() . '/') . '</a>' ?></label> |
| | 117 | + </td> |
| | 118 | + <td style="text-align:right;"> |
| | 119 | + <input id="communityCollTitle" type="text" name="ccollname" disabled="disabled" /> |
| | 120 | + </td> |
| | 121 | + </tr><td> </td><td style="text-align:right;"> |
| 109 | 122 | <input id="saveButton" type="submit" value="<?php $this->msg('coll-save_collection') ?>"<?php if (count($this->data['collection']['items']) == 0) { ?> disabled="disabled"<?php } ?> /> |
| | 123 | + </tr></table> |
| 110 | 124 | </form> |
| 111 | 125 | |
| 112 | 126 | <?php } else { |