summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorDaniel Napora <napcok@gmail.com>2014-01-02 12:25:43 +0100
committerDaniel Napora <napcok@gmail.com>2014-01-02 12:25:43 +0100
commit7c85cd1ff2a0cb4e00f750d196203653bfd6a546 (patch)
tree7fc632cd0e4e1a14eb91e29c6a21c221ff2d31b7 /usr
parent5e6815e6665e60256de2d6be2f1663838cc7d303 (diff)
downloadmageiawelcome-7c85cd1ff2a0cb4e00f750d196203653bfd6a546.tar
mageiawelcome-7c85cd1ff2a0cb4e00f750d196203653bfd6a546.tar.gz
mageiawelcome-7c85cd1ff2a0cb4e00f750d196203653bfd6a546.tar.bz2
mageiawelcome-7c85cd1ff2a0cb4e00f750d196203653bfd6a546.tar.xz
mageiawelcome-7c85cd1ff2a0cb4e00f750d196203653bfd6a546.zip
Info about configuring online media added
Diffstat (limited to 'usr')
-rw-r--r--usr/share/mageiawelcome/css/style.css6
-rw-r--r--usr/share/mageiawelcome/index.html12
-rw-r--r--usr/share/mageiawelcome/mageiawelcome.py1
3 files changed, 14 insertions, 5 deletions
diff --git a/usr/share/mageiawelcome/css/style.css b/usr/share/mageiawelcome/css/style.css
index ca9fd31..106ed4d 100644
--- a/usr/share/mageiawelcome/css/style.css
+++ b/usr/share/mageiawelcome/css/style.css
@@ -70,7 +70,7 @@ div#prevnext div:hover {color: #FFF;}
#rpmdrake_info{background:#FFCC00;color:#111;line-height:29px;border-bottom: 1px solid #111;text-align:center;text-shadow: none;}
div#applist {width:100%;clear:both;padding:0;margin:0;}
ul.filter, ul.list{float:left;margin-top:0;}
-ul.filter {width: 169px;background: #FFF;margin:0;height:375px;
+ul.filter {width: 169px;background: #FFF;margin:0;height:346px;
}
@@ -80,7 +80,7 @@ ul.filter li {display:block;
}
ul.filter li.current,ul.filter li.current:hover {background-color: #0A5C93; color: #FFF;}
ul.filter li:hover {background-color: #e5e5e5; color: #333;}
-ul.list {width: 630px;height:375px; overflow-x:hidden;overflow-y:auto;padding:0;list-style-type:none;border-left:1px solid #262F45;background-image: -webkit-linear-gradient(bottom, #2B8BCa 0%, #0C3A6D 100%);}
+ul.list {width: 630px;height:346px; overflow-x:hidden;overflow-y:auto;padding:0;list-style-type:none;border-left:1px solid #262F45;background-image: -webkit-linear-gradient(bottom, #2B8BCa 0%, #0C3A6D 100%);}
ul.list img.icon {height:32px;width:32px; float:left;margin:6px;}
ul.list li {width: 660px;height:54px;margin: 0;position:relative;border-bottom:1px solid #262F45;padding:2px;}
@@ -101,3 +101,5 @@ ul.list li span.label{position:absolute; top:2px; right:56px;}
.chkbox input[type='checkbox']{margin-top: 14px;}
#selectedRPMS{position:absolute;bottom:46px;left:2px;background:rgba(0, 0, 0, 0.6); padding:3px;border-radius:3px;font-size:11px; z-index:200;width:165px;}
#install_all {position:absolute;bottom:14px;left:22px;}
+#rpmdrake_info a {cursor:pointer; text-decoration:underline;color: #111;}
+#rpmdrake_info a:hover{font-weight:bold;}
diff --git a/usr/share/mageiawelcome/index.html b/usr/share/mageiawelcome/index.html
index c44551e..b2ed0ab 100644
--- a/usr/share/mageiawelcome/index.html
+++ b/usr/share/mageiawelcome/index.html
@@ -68,7 +68,11 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
});
$('li#featured').trigger('click');
- $('li#home').click(function(){$('#welcome').trigger('click')});
+
+ $('#rpmdrake_info a').click(function()
+ {$('#home').trigger('click');
+ $('#repoconf').trigger('click');
+ });
//SIGNALS
// STARTUP CHECKBOX
@@ -151,7 +155,7 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
<div id="slide-pager">
<ol> <li><a data-slide-index="0" href="" id="welcome">$welcome</a></li>
<li><a data-slide-index="1" href="">$mcc</a></li>
- <li><a data-slide-index="2" href="">$conf_update</a></li>
+ <li><a data-slide-index="2" href="" id="repoconf">$conf_update</a></li>
<li><a data-slide-index="3" href="">$inst_remove</a></li>
</ol>
<div id="prevnext"><div id="slider-prev"><i class="icon-circle-arrow-left icon-2x"></i></div><div id="slider-next"><i class="icon-circle-arrow-right icon-2x"></i></div></div>
@@ -246,7 +250,9 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
</div>
<!-- RPMY -->
<div id="tab-2" class="tab">
- <div id="rpmdrake_info">$small_selection <button class="cmd small" data-run="rpmdrake"><i class="icon-share-alt"> </i> $r_rpmdrake</button></div>
+ <div id="rpmdrake_info">$small_selection <button class="cmd small" data-run="rpmdrake"><i class="icon-share-alt"> </i> $r_rpmdrake</button><br />
+ $besure_repos
+ </div>
<div id="applist">
<ul class="filter">
<!--<li class="filtr" id="filter-none">All Apps</li>-->
diff --git a/usr/share/mageiawelcome/mageiawelcome.py b/usr/share/mageiawelcome/mageiawelcome.py
index 16014fe..b822ce8 100644
--- a/usr/share/mageiawelcome/mageiawelcome.py
+++ b/usr/share/mageiawelcome/mageiawelcome.py
@@ -137,6 +137,7 @@ def main():
l['rpm_install'] = _("Applications")
l['applist'] = listapp
l['bodyclass'] = restricted_repos
+ l['besure_repos'] = _("Be sure you have enabled <a>online repositories</a>")
if os.path.exists(home + "/.mageiawelcome/norun.flag"):