summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorAlessandro Cosentino <cosenal@gmail.com>2012-07-31 23:40:22 -0400
committerAlessandro Cosentino <cosenal@gmail.com>2012-07-31 23:40:22 -0400
commiteca49d72c47eb9b59cb3192f24a442d4d3303092 (patch)
tree70bf63e7cf73fa3642c55b750972273973579cb6 /templates
parent44510977870d854196a28c644a7b61c7bbe55e6f (diff)
news app welcomes the new settings popup
Diffstat (limited to 'templates')
-rw-r--r--templates/main.php5
-rw-r--r--templates/settings.php (renamed from templates/part.importdialog.php)7
2 files changed, 7 insertions, 5 deletions
diff --git a/templates/main.php b/templates/main.php
index a3bac4921..700acd244 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -14,8 +14,10 @@
<li>
<button class="svg" id="addfeedfolder" title="<?php echo $l->t('Add Feed/Folder'); ?>" onclick="News.DropDownMenu.fade('ul#feedfoldermenu')"><img class="svg" src="<?php echo OCP\Util::linkTo('news', 'img/add.svg'); ?>" alt="<?php echo $l->t('Add Feed/Folder'); ?>" /></button>
</li>
- <li><button class="svg" title="<?php echo $l->t('Change View'); ?>">Eye</button></li>
<li>
+ <button class="svg" title="<?php echo $l->t('Change View'); ?>">Eye</button>
+ </li>
+ <li style="float: right">
<button class="svg" id="settingsbtn" title="<?php echo $l->t('Settings'); ?>"><img class="svg" src="<?php echo OCP\Util::imagePath('core','actions/settings.png'); ?>" alt="<?php echo $l->t('Settings'); ?>" /></button>
</li>
<ul>
@@ -30,6 +32,7 @@
echo $this->inc("part.nofeeds");
}
?>
+ <div id="appsettings" class="popup bottomleft hidden"></div>
</div>
<!-- Dialogs -->
diff --git a/templates/part.importdialog.php b/templates/settings.php
index 3aa2aca88..a4d6ec80d 100644
--- a/templates/part.importdialog.php
+++ b/templates/settings.php
@@ -1,6 +1,5 @@
-<div id="import_dialog" title="<?php echo $l->t("Settings"); ?>">
<dl>
- <dt><?php echo $l->t('Import'); ?></dt>
+ <dt><?php echo $l->t('Import feeds'); ?></dt>
<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">
@@ -9,6 +8,6 @@
</span>
<input type="file" id="file_upload_start" name="files[]" />
<input style="float: right" id="importbtn" type="submit" value="<?php echo $l->t('Import');?>" /></dd>
- <dt><?php echo $l->t('Export'); ?></dt>
+ <dt><?php echo $l->t('Export feeds'); ?></dt>
<dd></dd>
-</dl> \ No newline at end of file
+</dl> \ No newline at end of file