summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--css/news.css12
-rw-r--r--templates/part.nofeeds.php3
-rw-r--r--templates/settings.php3
3 files changed, 13 insertions, 5 deletions
diff --git a/css/news.css b/css/news.css
index 538f7e3fe..02484b237 100644
--- a/css/news.css
+++ b/css/news.css
@@ -50,6 +50,8 @@ div.add_parentfolder {
clear: both;
}
+ #firstrun #feed_add_url { width:20em; }
+
#firstrun #selections #addfeed_dialog_firstrun, #firstrun #selections #importopml_dialog_firstrun {
width:40em;
border:1px solid;
@@ -57,7 +59,15 @@ div.add_parentfolder {
border-radius:10px;
-moz-border-radius:10px; /* Firefox 3.6 and earlier */
}
-
+
+ #firstrun #selections #addfeed_dialog_firstrun {
+ height:5em;
+ }
+
+ #firstrun #selections #importopml_dialog_firstrun {
+ height:4em;
+ }
+
/* feed/folder list */
#leftcontent_news {
width: 20em;
diff --git a/templates/part.nofeeds.php b/templates/part.nofeeds.php
index 1a3355128..0e3f443c0 100644
--- a/templates/part.nofeeds.php
+++ b/templates/part.nofeeds.php
@@ -13,8 +13,7 @@
<button class="svg" id="browsebtn_firstrun" title="<?php echo $l->t('Upload file from desktop'); ?>" onclick="News.DropDownMenu.fade('ul#feedfoldermenu')"><img class="svg" src="<?php echo OCP\Util::imagePath('core','actions/upload.svg'); ?>" alt="<?php echo $l->t('Upload'); ?>" /></button>
<button class="svg" id="cloudbtn_firstrun" title="<?php echo $l->t('Select file from ownCloud'); ?>"><img class="svg" src="<?php echo OCP\Util::imagePath('core','actions/upload.svg'); ?>" alt="<?php echo $l->t('Select'); ?>" /></button>
<span id="opml_file">
- <?php echo $l->t('Select file from') . ' '; ?><a href='#' class="settings" id="browselink"><?php echo $l->t('local filesystem');?></a>
- <?php echo $l->t(' or '); ?><a href='#' class="settings" id="cloudlink"><?php echo $l->t('cloud');?></a>.
+ <?php echo $l->t('Select file from <a href="#" class="settings" id="browselink">local filesystem</a> or <a href="#" class="settings" id="cloudlink">cloud</a>'); ?>
</span>
<input type="file" id="file_upload_start" name="files[]" />
<input style="float: right" id="importbtn_firstrun" type="submit" value="<?php echo $l->t('Import');?>" />
diff --git a/templates/settings.php b/templates/settings.php
index ff1f1ceba..e9e34cc83 100644
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -3,8 +3,7 @@
<dd><button class="svg" id="browsebtn" title="<?php echo $l->t('Upload file from desktop'); ?>" onclick="News.DropDownMenu.fade('ul#feedfoldermenu')"><img class="svg" src="<?php echo OCP\Util::imagePath('core','actions/upload.svg'); ?>" alt="<?php echo $l->t('Upload'); ?>" /></button>
<button class="svg" id="cloudbtn" title="<?php echo $l->t('Select file from ownCloud'); ?>"><img class="svg" src="<?php echo OCP\Util::imagePath('core','actions/upload.svg'); ?>" alt="<?php echo $l->t('Select'); ?>" /></button>
<span id="opml_file">
- <?php echo $l->t('Select file from') . ' '; ?><a href='#' class="settings" id="browselink"><?php echo $l->t('local filesystem');?></a>
- <?php echo $l->t(' or '); ?><a href='#' class="settings" id="cloudlink"><?php echo $l->t('cloud');?></a>.
+ <?php echo $l->t('Select file from <a href="#" class="settings" id="browselink">local filesystem</a> or <a href="#" class="settings" id="cloudlink">cloud</a>'); ?>
</span>
<input type="file" id="file_upload_start" name="files[]" />
<input style="float: right" id="importbtn" type="submit" value="<?php echo $l->t('Import');?>" />