diff options
| author | Papoteur <papoteur@mageia.org> | 2018-11-10 09:55:36 +0100 |
|---|---|---|
| committer | Papoteur <papoteur@mageia.org> | 2018-11-10 09:55:36 +0100 |
| commit | 069954b3d16d7c631b5fbfd511dec74637094a67 (patch) | |
| tree | c8d92e2e52fc67f653166d332bf165bf498548ee | |
| parent | 2faeb6b83d579e8bf8777d475d966a90d15cab7f (diff) | |
| download | mageiawelcome-069954b3d16d7c631b5fbfd511dec74637094a67.tar mageiawelcome-069954b3d16d7c631b5fbfd511dec74637094a67.tar.gz mageiawelcome-069954b3d16d7c631b5fbfd511dec74637094a67.tar.bz2 mageiawelcome-069954b3d16d7c631b5fbfd511dec74637094a67.tar.xz mageiawelcome-069954b3d16d7c631b5fbfd511dec74637094a67.zip | |
New organization of tabs, suppression of Applications/welcome alternative
| -rw-r--r-- | usr/share/mageiawelcome/index.html | 288 | ||||
| -rw-r--r-- | usr/share/mageiawelcome/mageiawelcome.py | 16 |
2 files changed, 164 insertions, 140 deletions
diff --git a/usr/share/mageiawelcome/index.html b/usr/share/mageiawelcome/index.html index b5d9713..49f73ab 100644 --- a/usr/share/mageiawelcome/index.html +++ b/usr/share/mageiawelcome/index.html @@ -133,154 +133,168 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" </head> <body class="$bodyclass"><div id="logoright"></div> <header> - <nav> - <ul class="taby button-bar"> - <li href="#tab-1" class="active" id="home"><a class=""><i class="icon-home"> </i> $welcome_btn</a></li> - <li href="#tab-2"><a class=""><i class="icon-list-alt"> </i> $rpm_install</a></li> - </ul> - </nav> - <img src="img/mageia-2016-alpha.png" id="logo" /> - <div id="hdrinfo"> - $release<br /> - $kernel_l $kernel<br /> - $arch_l $arch<br /> - $desktop_l $desktop<br /> - </div> + <img src="img/mageia-2016-alpha.png" id="logo" /> </header> <section> - <div id="close"> - <span title="$youcan"><input id="startup" type="checkbox" name="showWindow" $checked> $show <button id="closebtn" type="submit" class="small"><i class="icon-off"> </i> $close</button></span> - </div> - <!-- START --> - <div id="tab-1" class="tab"> - <div id="slide-pager"> - <ol> <li><a data-slide-index="0" href="" id="welcome">$welcome_btn</a></li> - <li><a data-slide-index="1" href="">$mcc</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> + <div id="close"> + <span title="$youcan"><input id="startup" type="checkbox" name="showWindow" $checked> $show <button id="closebtn" type="submit" class="small"><i class="icon-off"> </i> $close</button></span> </div> - <!-- Slideshow --> - <ul class="slides"> - <li><div class="umenu"></div> - <div class="col_12"> - <h2 id="welcome">$welcome $user!</h2> - <p id="message">$welcome_msg</p> + <!-- START --> + <div id="tab-1" class="tab"> + <div id="slide-pager"> + <ol> + <li><a data-slide-index="0" href="" id="welcome">$welcome_btn</a></li> + <li><a data-slide-index="1" href="">$conf_media</a></li> + <li><a data-slide-index="2" href="" id="repoconf">$conf_update</a></li> + <li><a data-slide-index="3" href="">$mcc</a></li> + <li><a data-slide-index="4" href="">$rpm_install</a></li> + <li><a data-slide-index="5" href="">$inst_remove</a></li> + <li><a data-slide-index="6" href="">$list_config</a></li> + <li><a data-slide-index="7" href="">$go_further</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> </div> - <div id="links" class="col_12"> - <div class="mgalinks col_4"> - <h5>$h_documentation</h5> - <!--<a href="https://wiki.mageia.org/en/Mageia_4_What%27s_New" class="weblink button medium"><i class="icon-bullhorn"> </i> $features</a><br />--> - <a href="$relnotes_url" class="weblink button medium"><i class="icon-lightbulb"> </i> $relnotes</a><br /> - <a href="$errata_url" class="weblink button medium"><i class="icon-bolt"> </i> $errata</a><br /> - <a href="$newcomers_url" class="weblink button medium"><i class="icon-key"> </i> $newcomers</a><br /> - <a href="$h_documentation_url" class="weblink button medium"><i class="icon-book"> </i> $h_documentation</a> - </div> - <div class="mgalinks col_4"> - <h5>$h_support</h5> - <a href="$forum_url" class="weblink button medium"><i class="icon-heart"> </i> $forum</a><br /> - <a href="$wiki_url" class="weblink button medium"><i class="icon-globe"> </i> $wiki</a><br /> - <a href="irc://irc.freenode.net/#mageia" class="weblink button medium"><i class="icon-comments"> </i> $chat</a><br /> - <a href="https://bugs.mageia.org/" class="weblink button medium"><i class="icon-ambulance"> </i> $bugs</a><br /> - </div> - <div class="mgalinks col_4"> - <h5>$h_community</h5> - <a href="https://www.mageia.org/community/" class="weblink button medium"><i class="icon-group"> </i> $comm_center</a><br /> - <a href="https://www.mageia.org/contribute/" class="weblink button medium"><i class="icon-beaker"> </i> $contribute</a><br /> - <a href="https://www.mageia.org/donate/" class="weblink button medium"><i class="icon-money"> </i> $donate</a><br /> - <a href="https://identity.mageia.org/" class="weblink button medium"><i class="icon-signin"> </i> $joinus</a><br /> - </div> - </div> - </li> - <li><div class="umenu"></div> - <div class="col_6"><h5>$mcc</h5></div> - <div class="col_7"> - <p>$mccdesc</p> - <ul class="icons"> - <li><i class="icon-ok"> </i>$SM</li> - <li><i class="icon-ok"> </i>$H</li> - <li><i class="icon-ok"> </i>$NI</li> - <li><i class="icon-ok"> </i>$S</li> - <li><i class="icon-ok"> </i>$NS</li> - <li><i class="icon-ok"> </i>$LD</li> - <li><i class="icon-ok"> </i>$Sec</li> - <li><i class="icon-ok"> </i>$B</li> - </ul> - <button href="$mcc_url" class="medium blue inset weblink"><i class="icon-external-link"> </i> $h_documentation</button> + <!-- Slideshow --> + <ul class="slides"> + <li> + <div class="umenu"></div> + <div class="col_12"> + <h2 id="welcome">$welcome $user!</h2> + <p id="message">$welcome_msg</p> + </div> + </li> - </div> - <div class="col_5 center"><div id="mcc"></div><button class="cmd" data-run="drakconf"><i class="icon-share-alt"> </i> $mcc</button><br /><span>$adminpass</span></div> - </li> - <li><div class="umenu"></div><div class="col_6"><h5>$conf_media</h5> - $mag_media</div> - <div class="clearfix"> - <div class="col_8 column"> - <p>$core</p> - <p>$nonfree</p> - <p>$tainted</p> - </div> - <div class="col_4 column"> - <div class="notice warning"><i class="icon-warning-sign icon-large"></i> - $note + <li> + <div class="umenu"></div><div class="col_6"><h5>$conf_media</h5> + $mag_media</div> + <div class="clearfix"> + <div class="col_8 column"> + <p>$core</p> + <p>$nonfree</p> + <p>$tainted</p> + </div> + <div class="col_4 column"> + <div class="notice warning"><i class="icon-warning-sign icon-large"></i> + $note + </div> + <div class="right"><button class="cmd" data-run="drakrpm-edit-media"><i class="icon-share-alt"> </i> $editss</button><br /><span>$adminpass</span></div> + </div> + </div> + </li> + + <li><div class="umenu"></div> + <div class="col_12"><h5>$updsys</h5> + <div class="col_6"><p>$updpol</p> + <div class="right"><button class="cmd" data-run="drakrpm-update"><i class="icon-share-alt"> </i> $chkupd</button><br /><span>$userpass</span> </div> - <div class="right"><button class="cmd" data-run="drakrpm-edit-media"><i class="icon-share-alt"> </i> $editss</button><br /><span>$adminpass</span></div> </div> - </div> - <div class="col_12"><h5>$updsys</h5> - <div class="right"><button class="cmd" data-run="drakrpm-update"><i class="icon-share-alt"> </i> $chkupd</button><br /><span>$userpass</span> + </li> + <li><div class="umenu"></div> + <div class="col_6"><h5>$mcc</h5></div> + <div class="col_7"> + <p>$mccdesc</p> + <ul class="icons"> + <li><i class="icon-ok"> </i>$SM</li> + <li><i class="icon-ok"> </i>$H</li> + <li><i class="icon-ok"> </i>$NI</li> + <li><i class="icon-ok"> </i>$S</li> + <li><i class="icon-ok"> </i>$NS</li> + <li><i class="icon-ok"> </i>$LD</li> + <li><i class="icon-ok"> </i>$Sec</li> + <li><i class="icon-ok"> </i>$B</li> + </ul> + <button href="$mcc_url" class="medium blue inset weblink"><i class="icon-external-link"> </i> $h_documentation</button> + </div> - </div> - </li> - <li><div class="umenu"></div> - <div class="col_6"> - <h5>$inst_remove</h5> - <h6>$guirpmdrake</h6> - </div> - <div class="col_9"> <p>$rpmdrake_desc</p> - <p><button href="$SM_url" class="medium blue inset weblink"><i class="icon-external-link"> </i> $readmore</button> - </p></div> - <div class="col_3"><button class="cmd" data-run="rpmdrake"><i class="icon-share-alt"> </i> $r_rpmdrake</button><br /><span>$adminpass</span></div> - <h6 class="col_12">$urpmi</h6> - <div class="col_9"> - <p><button href="$urpmi_url" class="medium blue inset weblink"><i class="icon-external-link"> </i> $readmore</button></p> + <div class="col_5 center"><div id="mcc"></div><button class="cmd" data-run="drakconf"><i class="icon-share-alt"> </i> $mcc</button><br /><span>$adminpass</span></div> + </li> + + <li><div class="umenu"></div> + <!-- RPMY --> + <div id="tab-1" class="tab"> + <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 class="col_3"><button class="cmd" data-run="xvt"><i class="icon-share-alt"> </i> $r_term</button></div> + <div id="applist"> + <ul class="filter"> + <!--<li class="filtr" id="filter-none">All Apps</li>--> + <li class="filtr" id="featured"> $featured</li> + <li class="filtr" id="games"> $games</li> + <li class="filtr" id="internet"> $internet</li> + <li class="filtr" id="video"> $video</li> + <li class="filtr" id="audio"> $audio</li> + <li class="filtr" id="office"> $office</li> + <li class="filtr" id="graphics"> $graphics</li> + <li class="filtr" id="system"> $system</li> + <li class="filtr" id="programming"> $programming</li> + + <div id="selectedRPMS" data-placement="top"> + <div id="selectedPKGS"></div>$selected <span id="count_rpms">0</span></div> + <div id="install_all"> + <button class="install_all small pill"><i class='icon-circle-arrow-down'> </i> $inst_sel</button></div> + </ul> + <ul class="list" id="lista_applikacji"> + $applist + </ul> + </div><!-- /APP LIST --> + </div> </li> - - </ul> - </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><br /> - $besure_repos + <li><div class="umenu"></div> + <div class="col_6"> + <h5>$inst_remove</h5> + <h6>$guirpmdrake</h6> + </div> + <div class="col_9"> <p>$rpmdrake_desc</p> + <p><button href="$SM_url" class="medium blue inset weblink"><i class="icon-external-link"> </i> $readmore</button> + </p></div> + <div class="col_3"><button class="cmd" data-run="rpmdrake"><i class="icon-share-alt"> </i> $r_rpmdrake</button><br /><span>$adminpass</span></div> + <h6 class="col_12">$urpmi</h6> + <div class="col_9"> + <p><button href="$urpmi_url" class="medium blue inset weblink"><i class="icon-external-link"> </i> $readmore</button></p> + </div> + <div class="col_3"><button class="cmd" data-run="xvt"><i class="icon-share-alt"> </i> $r_term</button></div> + </li> + <li><div class="umenu"></div> + <div class="col_6"> + $release<br /> + $kernel_l $kernel<br /> + $arch_l $arch<br /> + $desktop_l $desktop<br /> + </div> + </li> + <li><div class="umenu"></div> + <div class="col_6"> + <h5>$go_further</h5> + </div> + <div id="links" class="col_12"> + <div class="mgalinks col_4"> + <h5>$h_documentation</h5> + <!--<a href="https://wiki.mageia.org/en/Mageia_4_What%27s_New" class="weblink button medium"><i class="icon-bullhorn"> </i> $features</a><br />--> + <a href="$relnotes_url" class="weblink button medium"><i class="icon-lightbulb"> </i> $relnotes</a><br /> + <a href="$errata_url" class="weblink button medium"><i class="icon-bolt"> </i> $errata</a><br /> + <a href="$newcomers_url" class="weblink button medium"><i class="icon-key"> </i> $newcomers</a><br /> + <a href="$h_documentation_url" class="weblink button medium"><i class="icon-book"> </i> $h_documentation</a> + </div> + <div class="mgalinks col_4"> + <h5>$h_support</h5> + <a href="$forum_url" class="weblink button medium"><i class="icon-heart"> </i> $forum</a><br /> + <a href="$wiki_url" class="weblink button medium"><i class="icon-globe"> </i> $wiki</a><br /> + <a href="irc://irc.freenode.net/#mageia" class="weblink button medium"><i class="icon-comments"> </i> $chat</a><br /> + <a href="https://bugs.mageia.org/" class="weblink button medium"><i class="icon-ambulance"> </i> $bugs</a><br /> + </div> + <div class="mgalinks col_4"> + <h5>$h_community</h5> + <a href="https://www.mageia.org/community/" class="weblink button medium"><i class="icon-group"> </i> $comm_center</a><br /> + <a href="https://www.mageia.org/contribute/" class="weblink button medium"><i class="icon-beaker"> </i> $contribute</a><br /> + <a href="https://www.mageia.org/donate/" class="weblink button medium"><i class="icon-money"> </i> $donate</a><br /> + <a href="https://identity.mageia.org/" class="weblink button medium"><i class="icon-signin"> </i> $joinus</a><br /> + </div> </div> - <div id="applist"> - <ul class="filter"> - <!--<li class="filtr" id="filter-none">All Apps</li>--> - <li class="filtr" id="featured"> $featured</li> - <li class="filtr" id="games"> $games</li> - <li class="filtr" id="internet"> $internet</li> - <li class="filtr" id="video"> $video</li> - <li class="filtr" id="audio"> $audio</li> - <li class="filtr" id="office"> $office</li> - <li class="filtr" id="graphics"> $graphics</li> - <li class="filtr" id="system"> $system</li> - <li class="filtr" id="programming"> $programming</li> - -<div id="selectedRPMS" data-placement="top"> -<div id="selectedPKGS"></div>$selected <span id="count_rpms">0</span></div> -<div id="install_all"> -<button class="install_all small pill"><i class='icon-circle-arrow-down'> </i> $inst_sel</button></div> + </li> </ul> - <ul class="list" id="lista_applikacji"> - $applist - - </ul> - </div><!-- /APP LIST --> - </div> + </div> - - </section> - </body> + + </section> +</body> </html> diff --git a/usr/share/mageiawelcome/mageiawelcome.py b/usr/share/mageiawelcome/mageiawelcome.py index c980038..4e9bb8d 100644 --- a/usr/share/mageiawelcome/mageiawelcome.py +++ b/usr/share/mageiawelcome/mageiawelcome.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 # -*- coding: utf-8 -*- import signal @@ -12,6 +13,12 @@ import gi gi.require_version('Gtk', '3.0') from gi.repository import Gtk +import sys + +PACKAGE_PARENT = '..' +SCRIPT_DIR = os.path.dirname(os.path.realpath(os.path.join(os.getcwd(), os.path.expanduser(__file__)))) +sys.path.append(os.path.normpath(os.path.join(SCRIPT_DIR, PACKAGE_PARENT))) + from webgui import start_gtk_thread from webgui import launch_browser from webgui import synchronous_gtk_message @@ -84,8 +91,10 @@ def main(): l['user'] = username l['welcome_msg'] = _("<p>Thank you for choosing Mageia!</p><p>We have put in a lot of effort to provide you with the best possible system. We hope you will have a good experience with Mageia. If you feel that our project is a good idea, we would also appreciate any contribution you can make to it for next versions.</p><p>To find out how you can help <a class='weblink' href='https://www.mageia.org/contribute/'>click here</a>.</p><p>Don't forget to tell your friends about Mageia.</p>") l['mcc'] = _("Mageia Control Center") - l['conf_update'] = _("Configure media sources and update system") + l['conf_update'] = _("Update system") l['inst_remove'] = _("Install and remove software") + l['list_config'] = _("Summary of this configuration") + l['go_further'] = _("To go further") l['h_documentation'] = _("Documentation") l['h_documentation_url'] = _("https://wiki.mageia.org/en/Documentation") l['features'] = _("New Features") @@ -131,6 +140,7 @@ def main(): l['note'] = _("<strong>Note!</strong> non-free and tainted are not enabled by default.") l['editss'] = _("Edit software sources") l['updsys'] = _("... and update system") + l['updpol'] = _("The Mageia's update policy is...") l['chkupd'] = _("Check system updates") l['guirpmdrake'] = _("GUI - RPMDrake") l['rpmdrake_desc'] = _("<span class='label green'>Rpmdrake</span> is a program for installing, uninstalling and updating packages. It is the graphical user interface of <span class='label green'>urpmi</span>") @@ -197,9 +207,9 @@ def main(): os.system("mkdir -p " + home + "/.mageiawelcome") os.system("touch " + home + "/.mageiawelcome/norun.flag") elif msg.startswith("http"): - subprocess.Popen(["xdg-open ", msg]) + subprocess.Popen(["xdg-open", msg]) elif msg.startswith("irc"): - subprocess.Popen(["xdg-open ", msg]) + subprocess.Popen(["xdg-open", msg]) elif msg.startswith("run"): args = shlex.split(msg) args.pop(0) |