[copr] master: README updated and LICENSE added (GPLv2+). (4686e94)
by bkabrda＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 4686e946dc7bff66ad95b034e93a4ed5c864d419
Author: Bohuslav Kabrda <bkabrda(a)redhat.com>
Date: Tue Jan 22 08:38:38 2013 +0100
README updated and LICENSE added (GPLv2+).
>---------------------------------------------------------------
LICENSE | 339 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
README | 7 +-
2 files changed, 343 insertions(+), 3 deletions(-)
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..d159169
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/README b/README
index 99991b3..0adcdcd 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
This is the master copr branch.
-Right now all the work is going on in 2 branches:
- - skvidal-backend - this is the backend/builder code
- - bkabrda-workspace - this is the frontend/webinterface code
+The project is currently divided in 2 parts:
+ - backend - this is the backend/builder code
+ - coprs_frontend - this is the frontend/webinterface code
@@ -20,3 +20,4 @@ Overview of use:
- it retrieves the results and saves them into the results dir
- it returns the build status and where to find the results to the front end
+copr project is licensed under GPLv2+ (see LICENSE file for details).
11 years, 3 months
[copr] master: Clean TODO file, lots of work has been done (3343bb6)
by bkabrda＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 3343bb663e5640876bf1151599dedd088808a257
Author: Bohuslav Kabrda <bkabrda(a)redhat.com>
Date: Tue Jan 22 08:28:12 2013 +0100
Clean TODO file, lots of work has been done
>---------------------------------------------------------------
coprs_frontend/TODO | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/coprs_frontend/TODO b/coprs_frontend/TODO
index 0f9a3a2..b0b324f 100644
--- a/coprs_frontend/TODO
+++ b/coprs_frontend/TODO
@@ -1,9 +1,5 @@
- Query optimization
-- More form validations?
-- It would be nice to be able to change allowed release arches dynamically by JS while creating/editing coprs
-- Convert all remaining forms into wtforms (login, etc)
- Admin area (making users proven and admins)
- Personal area (changing email)
-- Submitting first packages on copr creation
- Sending emails with important info?
- Logging
11 years, 3 months
[copr] master: Also keep the _builds_forms template naming consistent (098135d)
by bkabrda＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 098135d55a958e414de790da9d2ef12c6190c79c
Author: Bohuslav Kabrda <bkabrda(a)redhat.com>
Date: Tue Jan 22 08:21:42 2013 +0100
Also keep the _builds_forms template naming consistent
>---------------------------------------------------------------
coprs_frontend/coprs/templates/coprs/detail.html | 2 --
.../{_build_forms.html => _builds_forms.html} | 0
.../templates/coprs/detail/_builds_table.html | 2 +-
.../coprs/templates/coprs/detail/add_build.html | 2 +-
4 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/coprs_frontend/coprs/templates/coprs/detail.html b/coprs_frontend/coprs/templates/coprs/detail.html
index 04c4c2a..f332f36 100644
--- a/coprs_frontend/coprs/templates/coprs/detail.html
+++ b/coprs_frontend/coprs/templates/coprs/detail.html
@@ -1,7 +1,5 @@
{% extends "layout.html" %}
{% block title %}{{ copr.owner.name }}/{{ copr.name }} Copr{% endblock %}
-{% from "coprs/detail/_build_forms.html" import copr_build_form,
- copr_build_cancel_form with context %}
{% block body %}
<h1>{{ copr.owner.name }} / <strong>{{ copr.name }}</strong></h1>
diff --git a/coprs_frontend/coprs/templates/coprs/detail/_build_forms.html b/coprs_frontend/coprs/templates/coprs/detail/_builds_forms.html
similarity index 100%
rename from coprs_frontend/coprs/templates/coprs/detail/_build_forms.html
rename to coprs_frontend/coprs/templates/coprs/detail/_builds_forms.html
diff --git a/coprs_frontend/coprs/templates/coprs/detail/_builds_table.html b/coprs_frontend/coprs/templates/coprs/detail/_builds_table.html
index ddba34f..cc0d842 100644
--- a/coprs_frontend/coprs/templates/coprs/detail/_builds_table.html
+++ b/coprs_frontend/coprs/templates/coprs/detail/_builds_table.html
@@ -1,4 +1,4 @@
-{% from "coprs/detail/_build_forms.html" import copr_build_cancel_form, copr_build_repeat_form %}
+{% from "coprs/detail/_builds_forms.html" import copr_build_cancel_form, copr_build_repeat_form %}
{% macro builds_table(builds) %}
{% if builds %}
diff --git a/coprs_frontend/coprs/templates/coprs/detail/add_build.html b/coprs_frontend/coprs/templates/coprs/detail/add_build.html
index e7e8713..c0b1b61 100644
--- a/coprs_frontend/coprs/templates/coprs/detail/add_build.html
+++ b/coprs_frontend/coprs/templates/coprs/detail/add_build.html
@@ -1,7 +1,7 @@
{% extends "coprs/detail.html" %}
{% block title %}Adding Build for {{ copr.owner.name }}/{{ copr.name }}{% endblock %}
{% block new_build_selected %}selected{% endblock %}
-{% from "coprs/detail/_build_forms.html" import copr_build_form with context %}
+{% from "coprs/detail/_builds_forms.html" import copr_build_form with context %}
{% block detail_body %}
11 years, 3 months
[copr] master: Keep the naming of *Logic classes consistent (513dd23)
by bkabrda＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 513dd2328e73f0384d706b449b283eeba9e59dd1
Author: Bohuslav Kabrda <bkabrda(a)redhat.com>
Date: Tue Jan 22 08:17:47 2013 +0100
Keep the naming of *Logic classes consistent
>---------------------------------------------------------------
coprs_frontend/coprs/logic/coprs_logic.py | 2 +-
.../coprs/views/coprs_ns/coprs_general.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/coprs_frontend/coprs/logic/coprs_logic.py b/coprs_frontend/coprs/logic/coprs_logic.py
index 45ea492..c8daebf 100644
--- a/coprs_frontend/coprs/logic/coprs_logic.py
+++ b/coprs_frontend/coprs/logic/coprs_logic.py
@@ -105,7 +105,7 @@ class CoprsPermissionLogic(object):
def delete(cls, user, copr_permission):
db.session.delete(copr_permission)
-class CoprChrootLogic(object):
+class CoprsChrootLogic(object):
@classmethod
def mock_chroots_from_names(cls, user, names):
db_chroots = models.MockChroot.query.all()
diff --git a/coprs_frontend/coprs/views/coprs_ns/coprs_general.py b/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
index b878db0..749c6a8 100644
--- a/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
+++ b/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
@@ -66,7 +66,7 @@ def copr_new():
owner = flask.g.user,
created_on = int(time.time()))
coprs_logic.CoprsLogic.new(flask.g.user, copr, check_for_duplicates = False) # form validation checks for duplicates
- coprs_logic.CoprChrootLogic.new_from_names(flask.g.user, copr, form.selected_chroots)
+ coprs_logic.CoprsChrootLogic.new_from_names(flask.g.user, copr, form.selected_chroots)
db.session.commit()
flask.flash('New copr was successfully created.')
@@ -157,7 +157,7 @@ def copr_update(username, coprname):
# we don't change owner (yet)
copr.name = form.name.data
copr.repos = form.repos.data.replace('\n', ' ')
- coprs_logic.CoprChrootLogic.update_from_names(flask.g.user, copr, form.selected_chroots)
+ coprs_logic.CoprsChrootLogic.update_from_names(flask.g.user, copr, form.selected_chroots)
coprs_logic.CoprsLogic.update(flask.g.user, copr, check_for_duplicates = False) # form validation checks for duplicates
db.session.commit()
11 years, 3 months
[copr] master: Rename style-new.css to copr.css, remove the ugly old style (f079d44)
by bkabrda＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit f079d44b06bca68f63b4aa7f3bc9ec92157babdc
Author: Bohuslav Kabrda <bkabrda(a)redhat.com>
Date: Tue Jan 22 08:08:25 2013 +0100
Rename style-new.css to copr.css, remove the ugly old style
>---------------------------------------------------------------
.../coprs/static/{style-new.css => copr.css} | 0
coprs_frontend/coprs/static/style.css | 133 --------------------
coprs_frontend/coprs/templates/layout.html | 2 +-
3 files changed, 1 insertions(+), 134 deletions(-)
diff --git a/coprs_frontend/coprs/static/style-new.css b/coprs_frontend/coprs/static/copr.css
similarity index 100%
rename from coprs_frontend/coprs/static/style-new.css
rename to coprs_frontend/coprs/static/copr.css
diff --git a/coprs_frontend/coprs/static/style.css b/coprs_frontend/coprs/static/style.css
deleted file mode 100644
index 9f21dbe..0000000
--- a/coprs_frontend/coprs/static/style.css
+++ /dev/null
@@ -1,133 +0,0 @@
-body {
- background-color: #FFFFFF;
-
- font: 0.9em 'Helvetica Neue', Arial, 'Liberation Sans', FreeSans, sans-serif;
-}
-
-h1, h2, h3, h4, h5 {
- color: #3B6EB4;
-}
-
-h4 {
- margin-top: 0.2em;
- margin-bottom: 0.2em;
-}
-
-a {
- color: #3B6EB4;
-}
-
-a:hover {
- color: #5B8ED4;
-}
-
-div.menu {
- background-color: #2A5694;
- padding: 0.5em;
-}
-
-div.page, div.menu-inner {
- width: 750px;
- margin-left: auto;
- margin-right: auto;
-}
-
-div.page-inner {
-}
-
-div.menu a {
- font-size: 1.1em;
- font-weight: bold;
- padding-right: 0.5em;
-}
-
-div.menu a:link {
- color: #EEEEEE;
-}
-
-div.menu a:visited {
- color: #EEEEEE;
-}
-
-div.menu a:hover {
- color: #FFFFFF;
-}
-
-div.flash {
- background-color: #2A5694;
- border-radius: 5px;
- padding: 0.5em;
- margin: 0.5em;
- font-size: 1.1em;
- color: #FFFFFF;
-}
-
-div.pagination {
- text-align: center;
- margin: 0.5em;
-}
-
-div.copr {
-}
-
-table.builds-table {
- border-collapse: collapse;
- border: 1px solid #222222;
- width: 95%;
-}
-
-table.permissions-table {
- border-collapse: collapse;
- border: 1px solid #222222;
- text-align: center;
- width: 50%;
-}
-
-table.builds-table th, table.builds-table td, table.permissions-table th, table.permissions-table td {
- padding: 0.2em;
- border: 1px solid #222222;
-}
-
-tr.build-pending {
- color: #3B6EB4;
-}
-
-tr.build-running {
- color: #FF6600;
-}
-
-tr.build-succeeded {
- color: #22DD22;
-}
-
-tr.build-failed {
- color: #DD2222;
-}
-
-tr.build-canceled {
- color: #CDC90C;
-}
-
-a.log-url {
- float: right;
-}
-
-ul.chroots-list {
- list-style: none;
-}
-
-ul.repos-list {
- list-style: none;
-}
-
-ul.packages-list {
- list-style: none;
-}
-
-form.add-entry {
-}
-
-ul.form-errors {
- list-style: none;
- color: #FF0000;
-}
diff --git a/coprs_frontend/coprs/templates/layout.html b/coprs_frontend/coprs/templates/layout.html
index e59f336..458b731 100644
--- a/coprs_frontend/coprs/templates/layout.html
+++ b/coprs_frontend/coprs/templates/layout.html
@@ -2,7 +2,7 @@
<html>
<head>
<title>{% block title %}Coprs Build System{% endblock %}</title>
- <link rel=stylesheet type=text/css href="{{ url_for('static', filename='style-new.css') }}">
+ <link rel=stylesheet type=text/css href="{{ url_for('static', filename='copr.css') }}">
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
<script src="{{ url_for('static', filename='copr.js') }}"></script>
</head>
11 years, 3 months
[copr] master: The horizontal menu is better off with list then divs. (d0ea78d)
by bkabrda＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit d0ea78df4639dfe7a98ef7d3507a9ef15bef2b51
Author: Bohuslav Kabrda <bkabrda(a)redhat.com>
Date: Tue Jan 22 08:01:15 2013 +0100
The horizontal menu is better off with list then divs.
>---------------------------------------------------------------
coprs_frontend/coprs/static/copr.js | 11 +++++-
coprs_frontend/coprs/static/style-new.css | 21 +++++++----
coprs_frontend/coprs/templates/coprs/detail.html | 40 +++++++++++----------
3 files changed, 44 insertions(+), 28 deletions(-)
diff --git a/coprs_frontend/coprs/static/copr.js b/coprs_frontend/coprs/static/copr.js
index a6221da..8271b08 100644
--- a/coprs_frontend/coprs/static/copr.js
+++ b/coprs_frontend/coprs/static/copr.js
@@ -7,5 +7,14 @@ $(document).ready(function () {
// build detail menu arrow slider
$(document).ready(function() {
- $("div.horizontal-menu div a").hover(function() { $(this).toggleClass('pink-arrow'); });
+ $("div.horizontal-menu li").hover(
+ function() {
+ $("div.horizontal-menu li.selected").removeClass('selected').addClass('left-for-now');
+ $(this).toggleClass('hovered');
+ },
+ function() {
+ $("div.horizontal-menu li.left-for-now").removeClass('left-for-now').addClass('selected');
+ $(this).toggleClass('hovered');
+ }
+ );
});
diff --git a/coprs_frontend/coprs/static/style-new.css b/coprs_frontend/coprs/static/style-new.css
index 8848d1f..a014c68 100644
--- a/coprs_frontend/coprs/static/style-new.css
+++ b/coprs_frontend/coprs/static/style-new.css
@@ -175,23 +175,28 @@ div.horizontal-menu a {
color: #4d4d4d;
}
-div.horizontal-menu div.selected a {
+div.horizontal-menu ul {
+ margin: 0px;
+ padding: 0px;
+ float: left;
+}
+
+div.horizontal-menu li {
+ display: inline;
+ float: left;
+}
+
+div.horizontal-menu li.selected a, div.horizontal-menu li.left-for-now a {
color: #db3279;
margin-left: auto;
margin-right: auto;
}
-div.horizontal-menu div.selected, div.horizontal-menu a.pink-arrow {
+div.horizontal-menu li.selected a, div.horizontal-menu li.hovered a {
background: url("pink_arrow.png") no-repeat;
background-position: center bottom;
}
-div.horizontal-menu div.selected, div.horizontal-menu div.unselected {
- margin-right: 1em;
- display: inline;
- float: left;
-}
-
div.pkg-url-list {
white-space: pre;
background-color: #f9f9f9;
diff --git a/coprs_frontend/coprs/templates/coprs/detail.html b/coprs_frontend/coprs/templates/coprs/detail.html
index acf45aa..04c4c2a 100644
--- a/coprs_frontend/coprs/templates/coprs/detail.html
+++ b/coprs_frontend/coprs/templates/coprs/detail.html
@@ -6,25 +6,27 @@
{% block body %}
<h1>{{ copr.owner.name }} / <strong>{{ copr.name }}</strong></h1>
<div class="horizontal-menu">
- <div class="{% block overview_selected %}unselected{% endblock %}">
- <a href="{{ url_for('coprs_ns.copr_detail', username = copr.owner.name, coprname = copr.name) }}">Overview</a>
- </div>
- <div class="{% block permissions_selected %}unselected{% endblock %}">
- <a href="{{ url_for('coprs_ns.copr_permissions', username = copr.owner.name, coprname = copr.name) }}">Permissions</a>
- </div>
- <div class="{% block builds_selected %}unselected{% endblock %}">
- <a href="{{ url_for('coprs_ns.copr_builds', username = copr.owner.name, coprname = copr.name) }}">Builds</a>
- </div>
- {% if g.user and g.user.can_build_in(copr) %}
- <div class="{% block new_build_selected %}unselected{% endblock %}">
- <a href="{{ url_for('coprs_ns.copr_add_build', username = copr.owner.name, coprname = copr.name) }}">New Build</a>
- </div>
- {% endif %}
- {% if g.user and g.user.can_edit(copr) %}
- <div class="{% block edit_selected %}unselected{% endblock %}">
- <a href="{{ url_for('coprs_ns.copr_edit', username = copr.owner.name, coprname = copr.name) }}">Edit</a>
- </div>
- {% endif %}
+ <ul>
+ <li class="{% block overview_selected %}unselected{% endblock %}">
+ <a href="{{ url_for('coprs_ns.copr_detail', username = copr.owner.name, coprname = copr.name) }}">Overview</a>
+ </li>
+ <li class="{% block permissions_selected %}unselected{% endblock %}">
+ <a href="{{ url_for('coprs_ns.copr_permissions', username = copr.owner.name, coprname = copr.name) }}">Permissions</a>
+ </li>
+ <li class="{% block builds_selected %}unselected{% endblock %}">
+ <a href="{{ url_for('coprs_ns.copr_builds', username = copr.owner.name, coprname = copr.name) }}">Builds</a>
+ </li>
+ {% if g.user and g.user.can_build_in(copr) %}
+ <li class="{% block new_build_selected %}unselected{% endblock %}">
+ <a href="{{ url_for('coprs_ns.copr_add_build', username = copr.owner.name, coprname = copr.name) }}">New Build</a>
+ </li>
+ {% endif %}
+ {% if g.user and g.user.can_edit(copr) %}
+ <li class="{% block edit_selected %}unselected{% endblock %}">
+ <a href="{{ url_for('coprs_ns.copr_edit', username = copr.owner.name, coprname = copr.name) }}">Edit</a>
+ </li>
+ {% endif %}
+ </ul>
</div>
{% block detail_body %}{% endblock %}
{% endblock %}
11 years, 3 months
[copr] master: Shift the pointer at copr detail dynamically (659b28c)
by bkabrda＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 659b28c7e6929a604907f3975885cc65ef6cc85b
Author: Bohuslav Kabrda <bkabrda(a)redhat.com>
Date: Mon Jan 21 15:40:35 2013 +0100
Shift the pointer at copr detail dynamically
>---------------------------------------------------------------
coprs_frontend/coprs/static/copr.js | 5 +++++
coprs_frontend/coprs/static/style-new.css | 15 ++++++---------
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/coprs_frontend/coprs/static/copr.js b/coprs_frontend/coprs/static/copr.js
index 1f6e223..a6221da 100644
--- a/coprs_frontend/coprs/static/copr.js
+++ b/coprs_frontend/coprs/static/copr.js
@@ -4,3 +4,8 @@ $(document).ready(function () {
$(this).hover(function() { $("table.builds-table tr.details").hide(); $(this).next().show(); });
});
});
+
+// build detail menu arrow slider
+$(document).ready(function() {
+ $("div.horizontal-menu div a").hover(function() { $(this).toggleClass('pink-arrow'); });
+});
diff --git a/coprs_frontend/coprs/static/style-new.css b/coprs_frontend/coprs/static/style-new.css
index 910898b..8848d1f 100644
--- a/coprs_frontend/coprs/static/style-new.css
+++ b/coprs_frontend/coprs/static/style-new.css
@@ -160,8 +160,7 @@ div.add-copr a {
div.horizontal-menu {
background-color: #ededed;
- padding: 0.5em;
- height: 2em;
+ height: 3em;
border-radius: 10px;
-moz-border-radius: 10px;
@@ -169,22 +168,20 @@ div.horizontal-menu {
}
div.horizontal-menu a {
+ display: block;
+ padding: 0.6em;
font-size: 1.1em;
font-weight: bold;
color: #4d4d4d;
}
-div.horizontal-menu img {
- display: block;
- margin-left: auto;
- margin-right: auto;
-}
-
div.horizontal-menu div.selected a {
color: #db3279;
margin-left: auto;
margin-right: auto;
- padding-bottom: 11px;
+}
+
+div.horizontal-menu div.selected, div.horizontal-menu a.pink-arrow {
background: url("pink_arrow.png") no-repeat;
background-position: center bottom;
}
11 years, 3 months
[copr] master: Canceling builds now redirects to builds list again (b29ad60)
by bkabrda＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit b29ad6013889eb9288bc1d068d5b3ad5ec3d1095
Author: Bohuslav Kabrda <bkabrda(a)redhat.com>
Date: Mon Jan 21 14:44:02 2013 +0100
Canceling builds now redirects to builds list again
>---------------------------------------------------------------
.../coprs/views/coprs_ns/coprs_builds.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py b/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py
index 1e28499..0154452 100644
--- a/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py
+++ b/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py
@@ -84,7 +84,7 @@ def copr_cancel_build(username, coprname, build_id):
db.session.commit()
flask.flash('Build was canceled')
- return flask.redirect(flask.url_for('coprs_ns.copr_detail', username = username, coprname = coprname))
+ return flask.redirect(flask.url_for('coprs_ns.copr_builds', username = username, coprname = coprname))
@coprs_ns.route('/detail/<username>/<coprname>/repeat_build/<int:build_id>/', methods = ['POST'])
@login_required
11 years, 3 months
[copr] master: Some JS fanciness for builds list (0aad258)
by bkabrda＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 0aad2581d214b7571f72c973d924fe00b115dc5f
Author: Bohuslav Kabrda <bkabrda(a)redhat.com>
Date: Mon Jan 21 14:43:43 2013 +0100
Some JS fanciness for builds list
>---------------------------------------------------------------
coprs_frontend/coprs/static/copr.js | 6 ++++++
coprs_frontend/coprs/static/style-new.css | 7 ++-----
.../templates/coprs/detail/_builds_table.html | 4 ++--
coprs_frontend/coprs/templates/layout.html | 2 ++
4 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/coprs_frontend/coprs/static/copr.js b/coprs_frontend/coprs/static/copr.js
new file mode 100644
index 0000000..1f6e223
--- /dev/null
+++ b/coprs_frontend/coprs/static/copr.js
@@ -0,0 +1,6 @@
+// showing build details
+$(document).ready(function () {
+ $("table.builds-table tr[class^='build-']").each(function (i, e) {
+ $(this).hover(function() { $("table.builds-table tr.details").hide(); $(this).next().show(); });
+ });
+});
diff --git a/coprs_frontend/coprs/static/style-new.css b/coprs_frontend/coprs/static/style-new.css
index 6c36042..910898b 100644
--- a/coprs_frontend/coprs/static/style-new.css
+++ b/coprs_frontend/coprs/static/style-new.css
@@ -236,15 +236,12 @@ table.builds-table {
width: 100%;
}
-table.builds-table td.build-end {
- border-bottom: 2px solid #4d4d4d;
-}
-
table.builds-table form {
display: inline;
}
-table.builds-table tr.build-details {
+table.builds-table tr.details {
+ width: 100%;
display: none;
}
diff --git a/coprs_frontend/coprs/templates/coprs/detail/_builds_table.html b/coprs_frontend/coprs/templates/coprs/detail/_builds_table.html
index 3b15490..ddba34f 100644
--- a/coprs_frontend/coprs/templates/coprs/detail/_builds_table.html
+++ b/coprs_frontend/coprs/templates/coprs/detail/_builds_table.html
@@ -20,8 +20,8 @@
<td>{{ build.ended_on|date_from_secs or 'Not yet' }}</td>
<td>{{ build.state }}</td>
</tr>
- <tr class="build-details">
- <td colspan=6 class="build-end">
+ <tr class="details">
+ <td colspan=6 class="end">
<div>
{% if g.user and g.user == build.user %}
{{ copr_build_cancel_form(build) }}
diff --git a/coprs_frontend/coprs/templates/layout.html b/coprs_frontend/coprs/templates/layout.html
index ac3e8ef..e59f336 100644
--- a/coprs_frontend/coprs/templates/layout.html
+++ b/coprs_frontend/coprs/templates/layout.html
@@ -3,6 +3,8 @@
<head>
<title>{% block title %}Coprs Build System{% endblock %}</title>
<link rel=stylesheet type=text/css href="{{ url_for('static', filename='style-new.css') }}">
+ <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
+ <script src="{{ url_for('static', filename='copr.js') }}"></script>
</head>
<body>
<div class="menu">
11 years, 3 months
[copr] master: Some playing around with the builds table (918ed51)
by bkabrda＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 918ed51bb89319538779ce2618d493f8cdbcfe54
Author: Bohuslav Kabrda <bkabrda(a)redhat.com>
Date: Mon Jan 21 14:04:13 2013 +0100
Some playing around with the builds table
>---------------------------------------------------------------
coprs_frontend/coprs/static/style-new.css | 12 ++++++++++++
.../templates/coprs/detail/_builds_table.html | 19 +++++++++++--------
2 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/coprs_frontend/coprs/static/style-new.css b/coprs_frontend/coprs/static/style-new.css
index 8265cff..6c36042 100644
--- a/coprs_frontend/coprs/static/style-new.css
+++ b/coprs_frontend/coprs/static/style-new.css
@@ -236,6 +236,18 @@ table.builds-table {
width: 100%;
}
+table.builds-table td.build-end {
+ border-bottom: 2px solid #4d4d4d;
+}
+
+table.builds-table form {
+ display: inline;
+}
+
+table.builds-table tr.build-details {
+ display: none;
+}
+
tr.build-pending {
color: #3B6EB4;
}
diff --git a/coprs_frontend/coprs/templates/coprs/detail/_builds_table.html b/coprs_frontend/coprs/templates/coprs/detail/_builds_table.html
index dfaf9de..3b15490 100644
--- a/coprs_frontend/coprs/templates/coprs/detail/_builds_table.html
+++ b/coprs_frontend/coprs/templates/coprs/detail/_builds_table.html
@@ -10,8 +10,6 @@
<th>Started on</th>
<th>Ended on</th>
<th>State</th>
- <th>Results</th>
- <th>Action</th>
</tr>
{% for build in builds %}
<tr class="build-{{ build.state }}">
@@ -21,18 +19,23 @@
<td>{{ build.started_on|date_from_secs or 'Not yet' }}</td>
<td>{{ build.ended_on|date_from_secs or 'Not yet' }}</td>
<td>{{ build.state }}</td>
- <td>{% if build.results %}<a href="{{ build.results }}">{% endif %}{{ build.results }}{% if build.results %}</a>{% endif %}</td>
- <td>
+ </tr>
+ <tr class="build-details">
+ <td colspan=6 class="build-end">
+ <div>
{% if g.user and g.user == build.user %}
{{ copr_build_cancel_form(build) }}
{% endif %}
{% if g.user and g.user.can_build_in(copr) %}
{{ copr_build_repeat_form(build) }}
{% endif %}
- </td>
- </tr>
- <tr>
- <td colspan=8>
+ <div>
+ {% if build.results %}
+ <h2>Results: </h2><a href="{{ build.results }}">{{ build.results }}</a>
+ {% else %}
+ <h2>No results yet.</h2>
+ {% endif %}
+ <div>
<h2>Package URLs:</h2>
<div class="pkg-url-list">{% if build.pkgs is not none %}{% for pkg in build.pkgs.split() %}<a href="{{ pkg }}">{{ pkg }}</a>
{% endfor %}{% endif %}</div>
11 years, 3 months